Commit Graph

172 Commits

Author SHA1 Message Date
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Aurorablade
ce3ecee145 Port of TG ghost role spawner and Corpse Landmark refactor (#8211)
Port of TG ghost role spawner and Corpse Landmark refactor
2018-10-03 11:31:55 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
FalseIncarnate
8c6685f1b0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen 2018-08-16 00:16:32 -04:00
Fox McCloud
4f10f52c7e tweaks 2018-07-27 14:51:04 -04:00
Fox McCloud
ebe0b82bb0 Species Refactor Fixes 2018-07-23 01:28:58 -04:00
Fox McCloud
6092e0319f name and further fixes 2018-07-19 02:04:03 -04:00
Crazy Lemon
384fe93d33 Merge pull request #8975 from Citinited/rpd-refactor
RPD refactor
2018-07-16 14:22:38 -07:00
Fox McCloud
ef23639921 Merge pull request #8875 from Citinited/put-that-cookie-down
Adds random fortunes to fortune cookies
2018-07-11 13:55:28 -04: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
7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
FalseIncarnate
7b823195e5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen 2018-04-24 22:09:33 -04:00
tigercat2000
8c1e61f63f Adds the aurora caelus event, the space equivelent of the northern lights. 2018-04-22 21:10:45 -07:00
FalseIncarnate
36dec344fa Merge conflict fix 2018-04-20 02:04:01 -04:00
Citinited
5f4b2eef0a More fortunes 2018-04-15 16:40:55 +01:00
Citinited
b66c700a63 tigercat & falseincarnate code suggestions 2018-04-14 16:40:25 +01:00
Citinited
1c8740ca93 Merge branch 'master' into put-that-cookie-down 2018-04-14 01:21:24 +01:00
Citinited
b60eb67202 Adds fortunes to fortune cookies 2018-04-14 01:06:11 +01:00
tigercat2000
57a4be2138 Merge pull request #8794 from Birdtalon/fixes
Fixes and tweaks
2018-04-06 20:02:07 -07:00
Birdtalon
886b2ad8d9 nanocalcium reagent restriction 2018-03-23 17:35:15 +00:00
tigercat2000
b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC
# Conflicts:
#	code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
tigercat2000
50f9d695a5 Merge pull request #8124 from Aurorablade/Dreams
Byond the wall of sleep
2018-03-19 13:42:00 -07:00
FalseIncarnate
d7f89ed25f Moves lists off cooking machines
Moves the lists for recipes, reagents, and ingredients off of the
individual machines to a shared global list.
2018-03-18 00:42:47 -04:00
tigercat2000
dca16e60cf PS -> SMC Ports: LINDA, Spacedrift, Throwing
This commit ports LINDA, spacedrifting, and throwing to the SMC.
2018-03-02 23:58:57 -08:00
Aurorablade
64c4883cc2 paths 2017-11-28 21:10:59 -05:00
tigercat2000
a5e4ccdc18 Merge pull request #8103 from FalseIncarnate/reagents
Silver Slime Core and Random Reagent changes
2017-10-27 09:23:50 -07:00
Crazy Lemon
fcd3ea3194 Merge pull request #8241 from Allfd/fastest-linda
Fastest linda
2017-10-22 10:18:52 -07:00
Aurorablade
73b0f32927 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-10-07 22:46:57 -04:00
FalseIncarnate
1ced72dfa5 Compromise is a bitch 2017-09-18 20:21:24 -04:00
Aurorablade
84d5a4b721 jump 2017-09-16 23:27:20 -04:00
FalseIncarnate
00583d6f8f Silver Slime Core and Random Reagent changes
Silver Slime Cores now should only spawn drink containers that come
pre-filled with a drink.
- This means no more empty cups/trophies/bottler containers/flasks

Silver Slime Core no longer can summon a random reagent bottle which can
contain ANY reagent
- Adminordrazine was stupidly included in the possibilities
- The core can still summon forth a random drink bottle, which contains
a random drink reagent

Removed a file's worth of relative pathing (random_items.dm)
- Additionally adjusted the code for picking random reagents to use
copied lists or `get_random_reagent_id()` as appropriate to keep things
sanitized and respect blacklisted chems

Also removed nanites, xenomicrobes, and adminordrazine from lists used
to generate random reagent things (like bottles and pills), replaced
with syndicate nanites (which are found in syndicate medical borgs and
much safer to have accessible)

🆑
tweak: Silver Slime Core reactions can only summon forth drinks that
actually contain a drink. Begone thirst!
tweak: Removes some "unsafe" chemicals from lists of potential chemicals
for inclusion in things like random pills or bottles, added one to
replace them.
/🆑
2017-09-14 21:57:48 -04:00
Citinited
9df10ab215 Adds flaming moe to the list of drinks 2017-09-04 15:26:48 +01:00
Fox-McCloud
543add7c10 Initial Commit 2017-08-10 18:01:03 -04:00
Aurorablade
8e5f3102ff Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-07-31 17:20:30 -04:00
Fox-McCloud
4419683890 Reagents Cleanup 2017-07-22 05:18:13 -04:00
Fox-McCloud
17d7232cf3 Removes Disease one and Virology 2017-07-08 23:10:17 -04:00
Fox-McCloud
08c8ba569c Adds Radio Jammers 2017-06-30 18:20:21 -04:00
Aurorablade
536ddcc7bd Works 2017-06-24 22:31:42 -04:00
Aurorablade
d6434bef1b morefeedback 2017-06-22 19:20:29 -04:00
Aurorablade
f2f68bdef9 Commit for Peer Review 2017-06-22 00:35:19 -04:00
Fruerlund
bde62d63b0 Records will now be saved and can be printed again
Log files will now be stored in a list and can be accessed via the
security records computer
2017-05-14 18:59:56 +02:00
Fruerlund
840326ebe0 Adds celllogs (hopefully) 2017-05-08 17:24:46 +02:00
Jovan
7898583968 Change Door Sounds 2017-03-13 06:25:19 -04:00
davipatury
af6db09309 Merge remote-tracking branch 'origin/master' into modular_computers 2017-03-04 15:44:20 -03:00
Crazy Lemon
186edb14e7 Merge pull request #6468 from tigercat2000/job_refactor_tg
Ported /tg/'s outfit datums, refactored job controller to support them
2017-02-25 17:54:01 -08:00
Fox McCloud
616a0ff8d1 Merge pull request #6446 from Kyep/terrorspiders-PR3
Terror Spiders 3 - Awaymission & AI
2017-02-25 17:04:30 -05:00
Tigercat2000
fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08:00