cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-19 18:17:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,504 Commits 17 Branches 2 Tags
f543a60e3051973db717cc4fe5335e62c8d2a708
Commit Graph
12970 Commits
Author SHA1 Message Date
Fox McCloud bca1fd7005 Merge pull request #4044 from Tastyfish/orange-hampsters 
Adds power-generating treadmills to brig cells
 2016-03-31 20:27:43 -04:00
Fox McCloud 8f6d358ea1 Merge pull request #4018 from Tastyfish/buttbots 
Captain Beepsky and His Merry Medibots
 2016-03-31 20:07:43 -04:00
TheDZD 4a3eb6cb07 Merge pull request #4057 from Aurorablade/iconfix 
Fixes bloated human head
 2016-03-31 18:18:35 -04:00
Aurorablade b35299079f Fixes bloated human head 2016-03-31 17:01:23 -04:00
Tastyfish bd76a0b3fb Fixes paper limit bugs 2016-03-31 16:58:27 -04:00
Aurorablade a278328312 reworked the event 2016-03-31 14:03:05 -04:00
Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2 
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
 2016-03-31 13:33:46 -04:00
ProperPants f91b5ee332 Never make commits literally five minutes after waking up. 2016-03-31 08:31:35 -04:00
ProperPants bd4230f469 Cyborg wood was being used by drones. No longer. 2016-03-31 08:25:03 -04:00
ProperPants 0f9797a7c2 Cyborg wood is gone. I don't know why it was there in the first place. 2016-03-31 08:18:39 -04:00
Fox-McCloud 24139b8a84 Refactor of Simple Animal Eating 2016-03-31 07:15:46 -04:00
Fox McCloud 68dd38c10d Merge pull request #4040 from Tastyfish/paichat 
Adds chatroom to PAIs
 2016-03-31 04:15:58 -04:00
Aurorablade ebea66f7dd heeeeeheeee 2016-03-31 02:12:57 -04:00
Aurorablade 0feac81bba TeeHee 2016-03-31 02:10:27 -04:00
Crazylemon64 221cbc82a9 I tested this, and IPCs should go blind upon losing their head 
I think the cause of this bug was organs not being removed on decap, which
has since been fixed
 2016-03-30 21:16:42 -07:00
Fox-McCloud d2907e3631 oh hell 2016-03-30 22:52:36 -04:00
Fox-McCloud 560eb17f9d Fully Re-Activates Disease1 2016-03-30 22:31:59 -04:00
ProperPants b764f18840 I forgot to change the cyborg modules back to normal for the tiles. 2016-03-30 22:16:09 -04:00
Fox McCloud d1765e0e14 Merge pull request #4019 from tigercat2000/disease1 
-tg- disease1
 2016-03-30 21:29:58 -04:00
Tigercat2000 ec3502af38 Fix the last of fox's noted bugs, runtime prevention 2016-03-30 18:12:03 -07:00
ProperPants bca3c683e2 Cyborg versions of stacks that didn't already have them. Increased cyborg starting rods to one full stack (60 rods). 2016-03-30 20:55:57 -04:00
TheDZD cc6e89ace8 Merge pull request #4030 from Fox-McCloud/advanced-camera-port 
Ports Advanced Cameras
 2016-03-30 18:48:16 -04:00
Fox-McCloud 9127c357e9 further thingssssssssssssssssssssssss 2016-03-30 18:17:55 -04:00
Tastyfish fb9c883b90 Makes medibots ignore IPC's 2016-03-30 17:55:31 -04:00
Tastyfish 1fc692ba94 Adds power-generating treadmills to brig cells. 2016-03-30 17:08:04 -04:00
Fox McCloud d83391fa68 Merge pull request #4005 from FlattestGuitar/alcohol 
Alcohol percentages!
 2016-03-30 16:44:41 -04:00
Fox McCloud ec9a7a486d Merge pull request #3927 from Crazylemon64/metal_foam_space_flooring 
Metal foam walls will now also produce plating on space tiles
 2016-03-30 16:26:56 -04:00
Fox McCloud 0f8085e1d8 Merge pull request #3980 from Aurorablade/ArtsAndCrafts 
Fethas Carnival of Horrors:Rusty Iron Chef
 2016-03-30 16:25:27 -04:00
FalseIncarnate 5fb1946201 Fixes "Adjust Signaler Settings" option not working 
Window does show up behind the multi-tool menu, but that's not a huge
issue.
 2016-03-30 15:42:35 -04:00
Tigercat2000 917dc9ab54 Add PanDEMIC design datum 2016-03-30 10:58:24 -07:00
Tigercat2000 32c3cde6ad Fix advanced disease mixing (stupid fucking reagent code) 2016-03-30 10:55:22 -07:00
monster860 bac5ffa829 Fill mode 2016-03-30 13:52:11 -04:00
Tastyfish 80c0f0ee1f Make pai chatroom cost 5 2016-03-30 11:43:23 -04:00
FalseIncarnate b91740b19b Logic Gates 
Adds CONVERT Gates, for converting a signaler signal to logic or
vice-versa.

Restructured/renamed some of the new logic files
- Split up the logic_gates.dm file into three files
- mono_input.dm
- dual_input.dm
- converter.dm

Made the logic_gate machines auto-update their multitool menu when you
click the links

Made the logic gate circuit boards a product of the autolathe
- Take that science. Quit hogging all the boards, nerds.

Removed relative pathing from signaler.dm
 2016-03-30 02:21:10 -04:00
Tigercat2000 25fa8ea2c9 viro consoles 2016-03-29 19:15:17 -07:00
Tastyfish 653e6738b8 Removes pAI insertion from named secbots 2016-03-29 21:53:56 -04:00
Tastyfish 9826985f3f Adds chatroom to PAIs 2016-03-29 21:44:29 -04:00
Fox-McCloud c345b8a761 forcemove 2016-03-29 21:36:58 -04:00
TheDZD 4e5dca681b Merge pull request #4024 from Tastyfish/clickyclick 
Makes clicking a filled inventory slot's square be treated like clicking the item
 2016-03-29 17:14:39 -04:00
TheDZD feec3ea1d8 Merge pull request #4025 from tigercat2000/20slots 
Change max character slots to 20
 2016-03-29 17:14:20 -04:00
TheDZD efab653008 Merge pull request #4021 from Fox-McCloud/toy-tyrant 
Ends Science's Toy Tyranny
 2016-03-29 17:13:57 -04:00
monster860 8ec3dc388a Makes it not stay 2016-03-29 17:02:11 -04:00
monster860 5b3512039d Adds areaediting mode. 2016-03-29 16:57:57 -04:00
Fox-McCloud 6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
FalseIncarnate 1caf39230a Logic Gates WIP 3 
Allows mass driver buttons to send logic signals
- They send LOGIC_FLICKER, since they are only on when pressed, then
turn off when released
- Can send logic signals to a different ID tag than their associated
driver/door ID tag, configurable from the multitool menu

Allows light switches to send logic signals
- Will send LOGIC_ON or LOGIC_OFF signals to match their current state
- Send both when toggled and on the process() cycle
- Light control can be toggled via the multitool menu, so you can use
them as purely light switches, purely logic switches, or as dual
switches

Allows light switches to be made from metal sheets, just like mass
driver buttons (1 sheet per button)
- Fixes a resource duplication bug where driver buttons can be
disassembled for more metal than it takes to build them

Begins to move some code for various button types into the buttons.dm
file, rather than being scattered across multiple files
- Driver buttons code moved from door_control.dm
- Ignition switch code moved from igniter.dm

Renames driver_button.dm to buttons_switches.dm
- This is the file that contained the mountable frames for driver
buttons, and now also contains the frame for light switches.
 2016-03-29 03:11:42 -04:00
Crazylemon64 d113fc63e9 Removes dumbness 2016-03-28 23:47:50 -07:00
Crazylemon64 7aa519723b Merge branch 'master' of https://github.com/Crazylemon64/Paradise into metal_foam_space_flooring 2016-03-28 23:13:43 -07:00
Crazylemon64 00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Tigercat2000 61134f9ba4 Replace Synaptizine with Diphenhydramine, mineral for viro 2016-03-28 21:31:01 -07:00
Fox McCloud 65eab3d8c8 Merge pull request #4017 from ProperPants/WorkingBranch 
Additions to Engineering Cyborg and Maintenance Drones
 2016-03-29 00:17:23 -04:00