Commit Graph

300 Commits

Author SHA1 Message Date
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
tigercat2000
a881787c63 Formatting stuff 2018-10-07 22:15:59 -07:00
tigercat2000
64103f5f26 Refactor mind notes (part 1 of mind.dm refactor 😱) 2018-10-06 22:54:08 -07:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Fox McCloud
0891b32c61 Merge pull request #9509 from variableundefined/MemoryFix
Fixes edit memory cancel not working
2018-09-09 18:01:46 -04:00
variableundefined
a779687ef7 Actually fix the memory. Tyvm tiger 2018-09-09 12:18:24 +08:00
variableundefined
aabfa4a71b Super minor fix 2018-09-09 09:32:58 +08:00
variableundefined
535f12ebf0 Fixes a woops with vampire 2018-09-08 21:48:09 +08:00
Fox McCloud
c6bb2ecd4d abductor stuff 2018-07-18 19:51:22 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -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
20a2594bfc Merge pull request #9046 from Fox-McCloud/wish-granter
Datumizes Wishgranter
2018-06-13 16:06:05 -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
dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Tayyyyyyy
497072d4d1 Update pronoun usage 2018-05-25 18:34:22 -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
Fox McCloud
c46cd7835b Datumizes Wishgranter 2018-05-20 15:48:29 -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
3c587ebad5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DatumAntag 2018-05-15 01:40:44 -04: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
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
Fox McCloud
ee6a156ca2 Removes Programmable Unloaders and a Few Unused Files 2018-04-30 00:41:26 -04:00
Fox McCloud
cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000
c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud
7f842e3223 no more runtimes 2018-03-29 00:44:53 -04:00
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
Aurorablade
68d10e773b tays suggestion on list plust something new as an update 2018-03-25 22:57:17 -04:00
Aurorablade
f93e282902 team shit 2017-11-08 00:36:40 -05:00
Aurorablade
354bdfda26 Base 2017-11-06 23:44:53 -05:00
Crazylemon64
9f0cd70f68 No more cloning suiciders 2017-06-22 23:06:28 -07:00
Aurorablade
36f9727d4d fixes 2017-05-09 03:39:53 -04:00
Fox McCloud
9a43700e5d Makes All Instances of Implanting Use Proper Procs (#7224) 2017-05-05 15:45:37 -07:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Sam
932cae0224 Loyalty implant -> Mindshield Implant 2017-04-09 16:50:51 +01:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
Sam
e43cb810a8 More bits wew. 2017-03-20 06:37:56 +00:00
Sam
3af44d2a08 More typos fixed... 2017-03-19 05:13:20 +00:00
Mark van Alphen
b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
Kyep
f2bd748a11 Adds alarm sound to objective changes
🆑
tweak: Antags whose objectives are manually announced by an admin, or
altered automatically as a result of their target cryoing, will now hear
a warning sound. The sound is the same as the 'crew transfer vote
called' sound. Additionally, the text notice for changed objectives is
more obvious.
/🆑
2017-03-02 22:48:46 -08:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Fox McCloud
300751373d Merge pull request #6280 from fludd12/Grey-Wingdings
Wingdings Revival^2
2017-02-13 06:26:56 -05:00
Fox McCloud
93df42e792 Merge pull request #6342 from uraniummeltdown/clingmemory
Changeling Absorb Memory Fix
2017-02-07 09:21:32 -05:00