cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 15:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,455 Commits 26 Branches 2 Tags
3dd4f16008ddecb3e482bcd670b8afefdb0d54cb
Commit Graph

242 Commits

Author SHA1 Message Date
Fox-McCloud
2453735d3f part 2 2016-04-17 00:21:31 -04:00
Fox-McCloud
f817351d2a part1 2016-04-16 10:40:21 -04:00
TheDZD
eba294357a It's the bees 2016-04-14 20:30:30 -04:00
Tigercat2000
dd79aaa967 Merge remote-tracking branch 'upstream/master' into to_chat 
Conflicts:
	code/game/machinery/door_control.dm
 2016-04-05 21:10:36 -07:00
FalseIncarnate
8a558a7c96 Merge Conflict 2016-04-05 19:26:30 -04:00
FalseIncarnate
40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07: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
ProperPants
b764f18840 I forgot to change the cyborg modules back to normal for the tiles. 2016-03-30 22:16:09 -04:00
ProperPants
2b4456c12f Cleaned up some cyborg stacks to take almost everything from the parent. 2016-03-30 22:13:28 -04:00
ProperPants
065f3c8a9d Removed the tiles because apparently they're pointless. 2016-03-30 21:32:41 -04: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
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
ProperPants
15946be225 Operating tables can now be destroyed with a wrench. They give back as much plasteel as they cost to allow them to be moved. Trimmed dumb description for metal sheets. 2016-03-29 19:50:38 -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
ProperPants
c1affcd02b Cyborg versions of some stuff. 
Added a line in some commentary that should have been there, but wasn't.
 2016-03-28 23:36:03 -04:00
ProperPants
cff2b62736 Deleted a blank line and some unused code that I came across. 
Tigercat2000 gave me permission.
 2016-03-28 22:51:27 -04:00
ProperPants
937a4c7479 Forgot something else 2016-03-28 22:42:12 -04:00
ProperPants
b5c073e58b Removes plasteel from drones and borgs. 2016-03-28 21:32:46 -04:00
ProperPants
f8f132d2f1 Should make robots unable to build anything out of plasteel and only plasteel. Here's hoping. 2016-03-28 17:06:38 -04:00
ProperPants
f928b62492 Surprise commit. Fixed my borking of engi borg reduced cable coil. Removed plasteel from engi borg. Formatting fixes. 2016-03-27 23:23:38 -04:00
ProperPants
f79d33d47b This should add magboots and plasteel to maintenance drones. This should also add plasteel to engineers, and make synthetics capable of using plasteel. 2016-03-27 21:26:45 -04:00
Aurorablade
db887489d3 tiggersgonnaeatme 2016-03-23 17:31:29 -04:00
Tastyfish
c3de0cf196 Removes picture frames 2016-03-14 04:35:35 -04:00
TheDZD
c00b89e2af Merge pull request #3805 from Fox-McCloud/science-nerf 
Heavily Rebalances Science
 2016-03-10 19:16:38 -05:00
Fox-McCloud
3ac2f23377 Heavily Rebalances Science 2016-03-09 02:58:05 -05:00
TheDZD
4e47626af7 Merge pull request #3767 from Tastyfish/silence 
Tranquillité, Prospérité & Mimeré
 2016-03-08 19:32:29 -05:00
Tastyfish
738e81f8df A couple tweaks to the mime stuff 2016-03-06 04:57:03 -05:00
Tastyfish
d189d70f4a Adds tranquillite 
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
 2016-03-06 01:49:30 -05:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Tastyfish
4f3ce4ecbc Adds picture frames 2016-02-21 21:00:45 -05:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Tastyfish
677ebfbb9d Fixed catwalks dropping wrong amounts 2016-02-16 19:17:57 -05:00
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Tastyfish
7027c217bf Some items has plasma typo in origin tech 2016-01-30 15:04:33 -05:00
Fox-McCloud
2242fac80a TG Riot Shield Port and Tweaks 2016-01-26 22:06:05 -05:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Fox-McCloud
f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
Aurorablade
95dca71432 Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-21 21:11:26 -05:00
Fox-McCloud
dd587ab4c5 Raw Telecrystal on Uplink Implants 2016-01-19 00:23:56 -05:00
Aurorablade
51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Fox-McCloud
df75c3418d tweak 2016-01-09 21:19:20 -05:00
Fox-McCloud
a2e825603e Adds in Tradable Telecrystals 2016-01-09 17:42:03 -05:00
Tigercat2000
986c687d27 Merge remote-tracking branch 'upstream/master' into lighttiles 
Conflicts:
	code/game/objects/items/stacks/tiles/tile_types.dm
 2016-01-05 18:49:36 -08:00
Tigercat2000
a10d7d1bd2 fix lightfloors 2016-01-05 18:46:39 -08:00
Fox-McCloud
4221d033ab Slipping Refactor and Floors 2016-01-04 21:22:59 -05:00
Aurorablade
948adea83b Added Asses as an organ 
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
 2016-01-04 08:25:39 -05:00
Tigercat2000
31aab5452b -tg- smoothing/floor refactor 
Squashed:

Add plasteel goonplaque turf

Builtin_tile nulling

Levelupdate()

Fix falsewalls, update smoothing.dmm

fixes rwall decon
 2016-01-03 19:24:13 -08:00