cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-11 06:10:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph

4852 Commits

Author SHA1 Message Date
Fox McCloud e05594f5b5 Ragin' Mages Spell Cast Fix 2018-07-01 16:45:44 -04:00
FalseIncarnate e39ce07305 last requested change 2018-07-01 04:24:06 -04:00
datlo ff591585c6 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2018-06-29 18:45:55 +02:00
Crazy Lemon 2707c022ec Merge pull request #9141 from R1f72r/Highfive 
Change the High-five emote time frame from 2.5 seconds to 4 seconds
 2018-06-28 11:10:08 -07:00
datlo 8a909e4da5 Clown Magboots V2 
changed syndi description and fixed my accidental reverts sorry for the
commit spam I still stuck at github
 2018-06-28 12:10:22 +02:00
datlo 0100f679b0 Revert "Clown Magboots V1" 
This reverts commit 38d0c3652c.
 2018-06-28 12:03:11 +02:00
datlo c7392d2d54 Revert "woops" 
This reverts commit 06eeae5b06.
 2018-06-28 12:03:06 +02:00
datlo 31ff0cd6e4 Revert "Revert "woops"" 
This reverts commit cab9162d18.
 2018-06-28 11:42:06 +02:00
datlo cab9162d18 Revert "woops" 
This reverts commit 06eeae5b06.
 2018-06-28 11:40:21 +02:00
datlo 06eeae5b06 woops 
missed a couple of lines
 2018-06-27 23:42:24 +02:00
datlo 38d0c3652c Clown Magboots V1 
Item created, added to uplink
 2018-06-27 23:39:17 +02:00
R1f72r c38783af57 Update neutral.dm 2018-06-25 07:32:38 -04:00
tigercat2000 d2651925bb Merge pull request #9127 from Fox-McCloud/ragin-tweak 
Can Cast Spells on Z-Level 2 on Ragin'
 2018-06-19 15:42:00 -07:00
Anasari e598cc46bf Merge remote-tracking branch 'origin/master' into TGRefundPort 2018-06-19 07:46:31 +08:00
Ansari 2d0c55674f Merge branch 'master' into GlovesToDangerous 2018-06-19 07:21:12 +08:00
Fox McCloud 74378973a9 Can Cast Spells on Z-Level 2 on Ragin' 2018-06-18 17:19:59 -04:00
Fox McCloud c402e793ab Fixes Away Mission Weather 2018-06-16 23:03:14 -04:00
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
Citinited 2a310f3539 Renames a bunch of variables; prevents possible exploit 2018-06-02 08:52:31 +01:00
tigercat2000 5ace5944d9 Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings 2018-05-31 19:34:47 -07:00
Citinited d978472d27 RPD nanoUI improvement; misc. code tweaks 2018-05-31 22:44:10 +01:00
Citinited 14ba039d81 GLOB 2018-05-30 21:47:03 +01:00
Citinited 2ec3c797fd RPD refactor: part 2 2018-05-30 21:47:03 +01:00
FalseIncarnate 9af6eb086f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen 2018-05-25 22:42:41 -04: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
Ansari f4d3815ea4 Fix accidental leftover code 2018-05-24 04:49:26 +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