Commit Graph

11667 Commits

Author SHA1 Message Date
Fox McCloud
b7d41226ee Merge pull request #2920 from Crazylemon64/blood-n-guts
Makes freezer checks not use threads
2015-12-21 22:10:22 -05:00
Fox McCloud
0979afd8c5 Merge pull request #2910 from Crazylemon64/new_ipc_screens
Adds 4 new IPC screens: Scanline, RGB, Glider, and Console
2015-12-21 21:33:53 -05:00
Crazy Lemon
667208afc7 World.time is a thing, plain old time isn't 2015-12-21 11:44:22 -08:00
Crazylemon
3c14573cc1 Replaces the spawn() with a time check 2015-12-21 09:53:00 -08:00
Fox McCloud
56751ca394 Merge pull request #2905 from Crazylemon64/robolimb_recognition
Advanced structural roborepair fixes disfigured bits
2015-12-21 05:59:05 -05:00
Fox McCloud
bfcf3b4b5a Merge pull request #2886 from FalseIncarnate/master
Assorted Sprite-Related Fixes
2015-12-21 00:53:00 -05:00
FalseIncarnate
1d281e8a6f Cocoa spawning revert 2015-12-21 00:42:27 -05:00
Crazylemon
f908f12f5b Adds a dna adder to head code so that head removal doesn't runtime ever 2015-12-20 18:46:47 -08:00
Crazylemon
3f3886fcfb Heads will now keep their appearance and name even if grafted
This doesn't fiddle with actual identity though
2015-12-20 18:35:59 -08:00
Crazylemon
2667385040 Removes some extra color macros 2015-12-20 18:34:41 -08:00
TheDZD
1ddab7f612 Merge pull request #2867 from Crazylemon64/ipc_brain_fix
IPC multibrain fix
2015-12-20 21:31:49 -05:00
Fox McCloud
c4c7a51234 Merge pull request #2904 from Aurorablade/LINGLINGLINGWENTTHECRYBORG
Hud Fixups
2015-12-20 21:12:26 -05:00
Crazylemon
9d1dc3632b Adds a "Glider" IPC screen 2015-12-20 17:29:43 -08:00
Crazylemon
2979a64c4d Adds 3 new IPC screens: Scanline, RGB, and Console 2015-12-20 14:45:14 -08:00
Crazylemon
7dc03df621 Advanced structural roborepair fixes disfigured bits 2015-12-20 02:18:23 -08:00
Crazylemon
43dcb6d043 Death to my nasty odysseus mechud snowflake! 2015-12-20 01:46:36 -08:00
FalseIncarnate
97f7a0d7e8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-12-20 02:57:01 -05:00
Aurorablade
d75549fdd6 no more changling cyborgs
also added in some procs for as furture need...god i need sleep now.
2015-12-20 01:47:15 -05:00
TheDZD
ff32b32eb9 Merge pull request #2894 from Fox-McCloud/wormhole-projector
Ports Wormhole Projector
2015-12-20 00:34:44 -05:00
Fox-McCloud
8bfa404d9d auto-switching 2015-12-19 21:55:41 -05:00
Fox McCloud
6d1b361c7d Merge pull request #2888 from TheDZD/fluff
Donator Fluff Items: Tactics Edition
2015-12-19 20:35:15 -05:00
Fox-McCloud
ea11eaa387 Ports Wormhole Projector 2015-12-19 00:57:40 -05:00
Fox McCloud
4c03cf2599 Merge pull request #2797 from Aurorablade/HudRefactor
[Ready for Review][WTF]Hud refactor
2015-12-18 21:13:21 -05:00
Crazy Lemon
91b091358e Fixes a derp I made 2015-12-18 14:18:43 -08:00
Crazylemon64
1d19ddf6db Spaceacillin has now taken its wheaties
A chem that you need loads of to be useful being necessary to save
patients from not being tended to in a bit? Nah, supermedicine gogogo
2015-12-18 08:03:41 -08:00
FalseIncarnate
a744ffdc3c Assorted Sprite-Related Fixes
Candy canes no longer have transparent stripes
- Fixes #2876
- Moved candy.dmi into the icons/obj/food/ folder
- Removed the candy sprites from the food.dmi file

Replaced reagentchocolatebar with cocoa_pile
- This is what is made when you spill chocolate reagent on the floor,
and is not the same as the chocolate bars you use for making stuff
- Should avoid confusion and also fixes a potential infinite-generation
exploit of chocolate and sugar
- Fixes #2614

Flamethrower in-hand icons now display properly
- Fixes #2856
- Will always show a tank in the in-hand, regardless of if a tank is
attached

Smartfridges will now remain visible when you open their panels with a
screwdriver
- Fixes #2847

Hand-rolled cigarettes now show on sprite when equipped as a mask
- Fixes #2427

Apple seeds now have a proper seed packet
- Fixes #1409
- Will make the xenobotany machines mentioned in the issue buildable in
a separate PR, as that is beyond scope / feature-request
2015-12-18 08:45:30 -05:00
Crazylemon64
ee036825ce Some MMI adjustments put in a separate commit
These don't seem to work 100% nice, trying to view the held_brain of the
MMI with VV causes me to temporarily lose connection. Some advice would be
appreciated.
2015-12-18 05:02:45 -08:00
Crazylemon64
fe606492a0 Organs are now easier to keep clean for surgery
* They initially rot slower, and won't rot if on the same tile as a freezer

* Having dirty hands when doing internal organ surgery will now contaminate
the internal organs. Wash those hands!
2015-12-18 04:51:04 -08:00
Fox McCloud
b91e95120f Merge pull request #2869 from KasparoVy/master
Adds Vulpkanin Species Flag
2015-12-18 04:57:24 -05:00
Aurorablade
3ae8118b9c please let me have map merged right.... 2015-12-18 03:09:25 -05:00
Crazylemon64
860275f51d Splits the primary organ checking into another function
Also fixes the head and brain renaming so it works off of DNA instead of
the body you took it of
2015-12-17 22:42:28 -08:00
Aurorablade
ccd6d2641b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-17 22:43:09 -05:00
Tigercat2000
12911463e7 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
Conflicts:
	code/game/gamemodes/objective.dm
2015-12-17 18:46:50 -08:00
Tigercat2000
1ff3d20075 Last fixes 2015-12-17 18:38:13 -08:00
TheDZD
8e9cfff75a Merge pull request #2864 from Fox-McCloud/medigun
Ports TG Beam Code and Medigun
2015-12-17 21:19:13 -05:00
Crazylemon
855b110433 Organs are now preserved more reliably; First pass 2015-12-17 17:16:55 -08:00
Tigercat2000
b085bf8bab Shuttle README, Wrap up dev tools. 2015-12-17 16:49:19 -08:00
TheDZD
1fe27d3cde Donator Fluff Items: Tactics Edition
- Lunch pail (contains a soda, chips, and a sandwich)
- Tactical suit and tactical balaclava (both cosmetic only, the former is a jumpsuit)
- Combat pants and tactical armor vest (reskinned sec armor vest, for sec officer role only) NOTE: The pants have an on-mob worn icon, but not a general icon, currently uses chaps sprite as a placeholder.
- Dog whistle, summons a dog with a NODROP detective hat (yes, it's permanently glued to his head) because bluespace.
2015-12-17 19:12:23 -05:00
Aurorablade
f077de54ae sneaky sneaky guardian fix. 2015-12-17 18:55:39 -05:00
Fox-McCloud
fe3d1b7360 balance 2015-12-17 18:24:03 -05:00
Tigercat2000
91a9ab4683 Nuke the rest of bay shuttles. Fuck you, Bay shuttles. 2015-12-17 15:18:10 -08:00
Tigercat2000
7474cbcf48 Shuttles: Admin, Ferry, ERT + Science Fix 2015-12-17 14:21:42 -08:00
Tigercat2000
527475f886 Shuttles: NukeOps, Fixes 2015-12-17 11:41:55 -08:00
Tigercat2000
e014f4a1b6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-17 07:26:41 -08:00
KasparoVy
4453239421 Adds Vulpkanin Species Flag
Adds the Vulpkanin species flag to the cargo vendor, and fixes a couple
typos in the item descriptions.
2015-12-17 04:29:17 -05:00
Crazylemon64
d63f1607c3 No more surviving rayman reenactments 2015-12-17 00:42:23 -08:00
Crazy Lemon
8deec9b0a4 Update life.dm 2015-12-17 00:07:58 -08:00
Crazylemon64
26545e6ba1 Fixed up organ surgery so it'd reflect organs properly
This will work in spite of the states, so that sticking a human head on an
IPC will still let you remove the brain from that useless head, without
giving the brain any silly names
2015-12-16 23:01:28 -08:00
Aurorablade
52e43c4d2d good news everyone! It works! 2015-12-17 01:29:21 -05:00
Fox-McCloud
a9a0a49986 Ports TG Beam Code and Medigun 2015-12-16 21:05:10 -05:00