Commit Graph

12868 Commits

Author SHA1 Message Date
Fox-McCloud
4e04570a12 Remove Dropper Copy-Paste 2016-04-14 04:27:16 -04:00
Fox McCloud
1d030c5824 Merge pull request #4182 from pinatacolada/rolldown
Fixes #4181
2016-04-12 20:14:30 -04:00
pinatacolada
b9b0b3d58f Fixes #4181 2016-04-12 16:06:27 +01:00
Fox McCloud
d5c95892f6 Merge pull request #4146 from Aurorablade/Stupideyes
I HATE EYEBALLS
2016-04-12 03:29:24 -04:00
Fox McCloud
1097f66ecb Merge pull request #4165 from Tastyfish/sdql-update
More SDQL Insanity
2016-04-12 03:27:11 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs
Ports SNPCs
2016-04-11 20:44:50 -04:00
Fox McCloud
dab1303d46 Merge pull request #4150 from Tastyfish/away-reorder
Updates maploader code to be in line with tg's, startup improvements
2016-04-11 19:41:22 -04:00
Fox McCloud
62b57d4cbf Merge pull request #4155 from Tastyfish/bruh
Makes cans crushable by humans and janiborgs
2016-04-11 18:44:17 -04:00
Tastyfish
a298ca044a Fixes function call with lists 2016-04-11 16:29:20 -04:00
Tastyfish
59097a99ea Allows update to set to vars of vars, call procs in arbitrary expressions,
procs of vars
2016-04-11 03:00:21 -04:00
Aurorablade
3dcb3dfb3c lemons suggestions...kind of... 2016-04-10 22:25:52 -04:00
Fox McCloud
b40c369702 Merge pull request #4119 from Aurorablade/VehicleFramework
Ports Tg Simple Vehicle Framework
2016-04-10 20:40:04 -04:00
Tastyfish
ccbe2ca904 Makes cans crushable by humans and janiborgs 2016-04-10 17:20:09 -04:00
Aurorablade
dc16cfc49b no, no. i clean. 2016-04-10 07:26:24 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
Aurorablade
8be42cd15b vehicles now respect lube and bullets 2016-04-10 01:03:23 -04:00
Fox McCloud
6215646102 Merge pull request #4136 from FalseIncarnate/vendor
Vendor Changes and Minor Fixes
2016-04-10 00:31:31 -04:00
FalseIncarnate
397d71a3af Vendor Changes
Re-upload without the smoking pipe stuff.
2016-04-10 00:07:37 -04:00
FalseIncarnate
990c83c6bb Revert "Vendor and Pipe Changes"
This reverts commit d21168fb38.
2016-04-09 23:38:36 -04:00
Aurorablade
f883e06c2e Adjustments 2016-04-09 22:27:53 -04:00
Fox McCloud
922855385c Merge pull request #4143 from Tastyfish/syndi4life
Makes synipets and borgi not need to breathe air
2016-04-09 18:24:27 -04:00
Tastyfish
b6a7bbd622 Removes fun 2016-04-09 18:07:14 -04:00
Tastyfish
632595ce38 Tweaks 2016-04-09 16:00:59 -04:00
Tastyfish
2d521ac64e critical snpc hotfix 2016-04-09 15:20:27 -04:00
Tastyfish
20f8ca1095 Fixes meals prepared / food eaten scoreboard stats 2016-04-09 02:28:53 -04:00
Aurorablade
fab0a1ef17 I HATE EYEBALLS 2016-04-09 00:48:15 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Fox McCloud
ea9489db70 Merge pull request #4115 from tigercat2000/alt_appearances_remmie
Alternate Appearance system
2016-04-08 21:18:25 -04:00
Fox McCloud
9f4058a43e Merge pull request #4142 from Tastyfish/dsodfijas
Fixes cyborg pda messenger
2016-04-08 20:13:33 -04:00
Tastyfish
5aae9c30af Makes synipets and borgi not need to breathe, all cats eat mice (except syndicat) 2016-04-08 16:18:52 -04:00
Tastyfish
b00a8bf95a Fixes cyborg pdas 2016-04-08 15:00:52 -04:00
FalseIncarnate
d21168fb38 Vendor and Pipe Changes
Using a screwdriver on a vendor circuitboard now provides a nice list of machines to select from, rather than relying
on RNG to select them.

Vendor circuitboards have been moved from the Circuit imprinter to the Autolathe, and have had their costs tweaked accordingly
- Was 1000 glass and 20 sacid, now 750 glass and 250 metal
- This was because cargo is meant to be responsible for vending machines, and you had to get the supply containers from cargo ANYWAYS just to build a new one

Pipes, cigarettes, and joints can no longer be lit with a burnt match

Pipes and corncob pipes no longer can be refilled infinitely at whim
- A new item "pipe tobacco tin" has been added to the cigarette vendors, which can be used on an empty pipe to refill it 5 times before being consumed.
- Tobacco, Space Tobacco, Ambrosia Vulgaris, and Ambrosia Deus can be put directly into an empty pipe to fill it with that as an alternative

Pipes (the ones from the merch store computer) have had their volume reduced to 100, from 200 (that's still a lot of nicotine)

Corncob Pipes no longer come pre-filled, as that made no sense (normal pipes still come pre-filled, because you paid good money for that)
- They have also had their smoketime reduced to 400, from 800, so they don't last longer than purchased pipes
2016-04-08 02:51:04 -04:00
Fox McCloud
1e780bfcb5 Merge pull request #4131 from Aurorablade/DAMNMONKEYS
Playing with Monkey Meat
2016-04-07 22:31:39 -04:00
Aurorablade
7137af5fce forgot this 2016-04-07 22:20:50 -04:00
Aurorablade
7cf0f7627a Playing with Monkey Meat 2016-04-07 22:14:43 -04:00
Aurorablade
5e046ced40 fixed bed hookup
Removed runover, might need to change the buckled_mob.dir to the
ambulance bed moved thoug....ATV Turret still borked.
2016-04-07 22:10:51 -04:00
TheDZD
8ad5e18757 Merge pull request #4112 from Fox-McCloud/xenobio-overhaul
Xenobio Refactor/Changes
2016-04-07 17:54:33 -04:00
TheDZD
be9087cca9 Merge pull request #4113 from Fox-McCloud/statues-fixing
TG Statue Fixes/Refactor
2016-04-07 17:54:17 -04:00
TheDZD
8481dbb961 Merge pull request #4125 from Tastyfish/bloodfix
Fixes pulling person blood
2016-04-07 17:47:36 -04:00
Tastyfish
81d91df5ce Makes fingerless gloves functionally clipped 2016-04-07 17:02:17 -04:00
Tastyfish
29f9507052 Fixes pulling blood 2016-04-07 16:35:53 -04:00
Aurorablade
b58006db4e vrooom 2016-04-07 00:48:27 -04:00
Tigercat2000
801cbe7f8d Alternate Appearance system (from tgstation/-tg-station#16586)
This adds an "alternate appearance system" using image overrides and a new
handler system.

Usage:
 - Create a new `image()` casted as `var/image`
 - Set image.override = 1
 - Call mob.add_alt_appearance("appearance_ID", image, listOfMobsToDisplayTo).
 - To remove an image, you use mob.remove_alt_appearance("appearance_ID")

Comes with one usage, cardborg costumes. They will now disguise you as a
standard borg to any silicon mobs and yourself.
As this is a per-client system, that means that only silicon mobs and you will
see yourself as a standard borg. All other mobs will see you as a silly
human in a cardborg costume.
2016-04-06 13:58:03 -07:00
Fox-McCloud
64cd6a0cdc TG Statue Fixes/Refactor 2016-04-06 02:20:24 -04:00
Fox-McCloud
3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -04:00
Fox McCloud
a669d0fac4 Merge pull request #4107 from tigercat2000/to_chat
Replace most (if not all) output << operators with to_chat(user, message)
2016-04-06 00:39:02 -04:00
Fox McCloud
337ddd1896 Merge pull request #4111 from Tastyfish/straightjackets-derp
[s]Fixes restrained issue with slot clicking thing
2016-04-06 00:30:26 -04:00
Tigercat2000
797740da7d Fix all of the merge conflicts and lacking to_chats with 4041 2016-04-05 21:16:52 -07: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
Tastyfish
f86cb2b049 Fixes straightjacket issue with slot clicking thing 2016-04-05 23:24:24 -04:00