cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,023 Commits 26 Branches 2 Tags
b82393790efdca152e3318bb9dcee2f003e3d2df
Commit Graph

2269 Commits

Author SHA1 Message Date
tigercat2000
f31d79a961 Merge pull request #9064 from Anasari/MoreClickAntag 
One-click antag improvement. Antag-related refactor, memory confirmation & typo fixing
 2018-06-13 18:43:18 -07:00
tigercat2000
4e758344d3 Merge pull request #9050 from Fox-McCloud/weather-subsystem 
Converts and Updates Weather Subsystem
 2018-06-13 16:08:02 -07:00
tigercat2000
20a2594bfc Merge pull request #9046 from Fox-McCloud/wish-granter 
Datumizes Wishgranter
 2018-06-13 16:06:05 -07:00
Fox McCloud
003f9e58a2 tweak 2018-06-13 18:54:26 -04:00
Fox McCloud
5fb13096a2 Merge remote-tracking branch 'upstream/master' into weather-subsystem 
# Conflicts:
#	code/__DEFINES/layers.dm
 2018-06-13 16:56:19 -04:00
tigercat2000
40a7b791d0 Merge pull request #8162 from Aurorablade/TheCultOfMimes 
The cult of mimes
 2018-06-07 14:41:23 -07:00
Aurorablade
e8089070c6 Spulling r gud 2018-06-06 02:14:13 -04:00
Aurorablade
c71ce6a537 mew 2018-06-06 02:00:52 -04:00
Aurorablade
5a63d6c178 reeeeeeeeeeeee 2018-06-06 00:44:01 -04:00
Aurorablade
9a07b61ac1 TG updates 2018-06-05 00:57:08 -04:00
Aurorablade
fbfefdce0d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-06-05 00:15:42 -04:00
Fox McCloud
f96e1f648b Fixes Gloves of the North Star's Description 2018-06-03 20:04:53 -04:00
tigercat2000
5ace5944d9 Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings 2018-05-31 19:34:47 -07:00
tigercat2000
baf5fe64a7 Merge pull request #8967 from Tayyyyyyy/pronouns 
Pronouns!
 2018-05-25 19:39:11 -07:00
tigercat2000
075f190e0e Merge pull request #9056 from Anasari/SyndiePurchaseLog 
Syndicate purchase (and surplus crate content) are now logged to game_log
 2018-05-25 19:36:20 -07:00
Tayyyyyyy
2b666145d5 Fix objective text 2018-05-25 18:34:28 -07:00
Tayyyyyyy
98c6ddf5a7 Fix his, he, him 2018-05-25 18:34:28 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy
dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Tayyyyyyy
c80704e724 Conjugating verbs is hard 2018-05-25 18:34:23 -07:00
Tayyyyyyy
497072d4d1 Update pronoun usage 2018-05-25 18:34:22 -07:00
Ansari
7bedbeec6a No more redundant user 2018-05-26 09:11:08 +08:00
tigercat2000
6a0b9df7ab Merge pull request #9062 from Anasari/EMPJump 
EMP logging improvement
 2018-05-25 17:45:59 -07:00
Ansari
c932143938 Fixes cultist, remove redundant confirmation. Add confirmation prompt to other. Add option to adjust number for vox raiders 2018-05-24 09:58:07 +08:00
Fox McCloud
404c712aea Removes the last of the color macros 2018-05-23 14:05:17 -04:00
Ansari
7cb0b6fafe Add number of antags to create option to some one-click antag. Add make_vampire() function, fixes some typos 2018-05-23 21:13:09 +08:00
Ansari
827503b0a4 EMP now provide coordinates and allow you to jump to it. Most EMP instance except for the Experimentor and the Singularity are now logged. 2018-05-23 18:33:12 +08:00
Ansari
5e24d3169a Add surplus crate purchase log 2018-05-23 16:54:32 +08:00
Ansari
0c34abac39 Syndicate purchase are now logged to game_log 2018-05-22 12:42:08 +08:00
Fox McCloud
6cdfe70303 Converts and Updates Weather Subsystem 2018-05-21 00:01:18 -04:00
Fox McCloud
c46cd7835b Datumizes Wishgranter 2018-05-20 15:48:29 -04:00
Crazy Lemon
25a3811ad3 Merge pull request #9028 from Fox-McCloud/gloves-of-death 
Ports Gloves of the North Star
 2018-05-18 20:20:01 -07:00
Fox McCloud
3b9e7b2834 description tweak 2018-05-18 00:57:11 -04:00
Aurorablade
69ab788689 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-05-18 00:19:32 -04:00
Fox McCloud
45858df458 Ports Gloves of the North Star 2018-05-17 17:20:28 -04:00
Fox McCloud
5df7dfdaac Preps the Way for Datumized Antags 2018-05-15 21:55:44 -04:00
Aurorablade
c205f2662d Comments 2018-05-15 16:51:01 -04:00
Aurorablade
5d3ce2ac22 compiles 
and removes shit we do not support yet.
 2018-05-15 02:08:54 -04:00
Aurorablade
3c587ebad5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DatumAntag 2018-05-15 01:40:44 -04:00
Aurorablade
ddb2305ddd updates to TG latest 
hopefully addressing alot of fox commits..now i got to update the branch...
 2018-05-15 01:40:15 -04:00
Crazy Lemon
3e4dbaf9c1 Merge pull request #9014 from Fox-McCloud/remove-dem-oldies 
Removes A Bunch of Old, Unused Files
 2018-05-14 17:55:12 -07:00
Fox McCloud
042ee7b77b comments 2018-05-14 20:40:39 -04:00
Fox McCloud
f2bc448d02 comments 2018-05-14 20:09:51 -04:00
Fox McCloud
ab780b3acf Removes A Bunch of Old, Unused Files 2018-05-14 06:40:48 -04:00
Fox McCloud
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
tigercat2000
c78075414c Merge pull request #8488 from Kyep/ds_tweaks 
Tweaks Deathsquad
 2018-05-04 19:03:54 -07:00
tigercat2000
662d7f34e2 Merge pull request #8949 from Kyep/tsf_marines 
Solar Federation Outfit Fixes/Tweaks
 2018-05-04 12:50:38 -07:00
Fox McCloud
ee6a156ca2 Removes Programmable Unloaders and a Few Unused Files 2018-04-30 00:41:26 -04:00
Aurorablade
1468ea38d2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-04-29 22:52:12 -04:00
Fox McCloud
6ab3ec48ed change these timers 2018-04-29 21:15:42 -04:00