Commit Graph

11691 Commits

Author SHA1 Message Date
TheDZD
7449cde946 Merge pull request #2996 from Fox-McCloud/pooling-upate
Pooling Update from TG
2015-12-23 21:50:07 -05:00
TheDZD
65bb820991 Merge pull request #2992 from Fox-McCloud/emp-fix
EMP Fixes
2015-12-23 21:49:57 -05:00
TheDZD
e33c83879d Merge pull request #2980 from Fox-McCloud/research-lockboxes
Research Lockbox Access Change and Wormhole Projector Lockboxing
2015-12-23 17:08:32 -05:00
Tigercat2000
6dccb387e7 Fix nukeops pipes n' nukes disapperin 2015-12-23 13:38:59 -08:00
Fox-McCloud
0adbb2788e Pooling Update from TG 2015-12-23 16:34:34 -05:00
Fox-McCloud
09dab6bdea EMP Fixes 2015-12-23 04:09:47 -05:00
Fox-McCloud
41c5a146e0 multiple access 2015-12-23 01:54:53 -05:00
Fox McCloud
f6612ee40f Merge pull request #2975 from Aurorablade/voxtest2
Voxtest2.ogg
2015-12-22 22:54:42 -05:00
TheDZD
bd8631ca48 Merge pull request #2981 from Fox-McCloud/field-generator-refactor
Field Generator Refactor+Fixes
2015-12-22 22:20:10 -05:00
TheDZD
335c9bc399 Merge pull request #2917 from Fox-McCloud/remove-tribesmen
Nukes Jungle Module
2015-12-22 22:19:38 -05:00
Fox McCloud
9e30d18941 Merge pull request #2922 from Crazylemon64/rdboard-reconfig
RnD Console Permissions are more Persistent
2015-12-22 22:01:36 -05:00
Fox-McCloud
bbf3b528c4 Field Generator Refactor+Fixes 2015-12-22 13:40:53 -05:00
Fox-McCloud
2481a8d7bd Research Lockbox Access Change and Wormhole Projector Lockboxing 2015-12-22 11:42:09 -05:00
Aurorablade
b92e5a4ccb fixes 2015-12-22 06:23:12 -05:00
Crazylemon64
72293bda07 Fixes that infinite table gripper bug 2015-12-21 23:31:09 -08:00
Crazylemon
132f149857 First test of a fix for the infinite tables bug 2015-12-21 22:14:56 -08:00
Crazylemon
e5bc5faa20 Adds in a "Public" console type for generous RD's 2015-12-21 20:17:58 -08:00
Crazylemon
aaf07170b6 RIP rd console locking, you were completely obsolete by rdconsole checks 2015-12-21 19:59:39 -08:00
Fox-McCloud
e4dd08c697 oops 2015-12-21 22:38:50 -05:00
Fox-McCloud
1796bcbc23 nukes jungle module 2015-12-21 22:32:54 -05:00
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
Crazylemon64
6ff1b00bed Locking the RnD console prevents simple deconstruction 2015-12-21 12:20:54 -08:00
Crazy Lemon
667208afc7 World.time is a thing, plain old time isn't 2015-12-21 11:44:22 -08:00
Crazylemon
b1c7452356 RD consoles no longer can be screwed apart when locked 2015-12-21 10:42:26 -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
2908021914 Removes Tribesman 2015-12-21 04:43:15 -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