Commit Graph

12831 Commits

Author SHA1 Message Date
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
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
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
FalseIncarnate
8a558a7c96 Merge Conflict 2016-04-05 19:26:30 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07:00
FalseIncarnate
40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -04:00
Tigercat2000
c72cc9606e Merge remote-tracking branch 'upstream/master' into to_chat
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
2016-04-05 15:54:48 -07:00
TheDZD
35f89251b3 Merge pull request #4100 from Fox-McCloud/sentience-potion-changes
Sentience Potion Changes
2016-04-05 18:37:57 -04:00
TheDZD
2546c290f4 Merge pull request #4095 from Fox-McCloud/mob-spawn-refactor
Simple Animal Spawn Refactor
2016-04-05 18:34:34 -04:00
Fox McCloud
59c0d41695 Merge pull request #4097 from Tastyfish/botsgoddamn
Tweaks/fixes some bot radio/language stuff, lazarus capsules
2016-04-05 17:53:00 -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
Fox McCloud
a361364a94 Merge pull request #4088 from tigercat2000/offhands
Add inactive hand to carbon get_access
2016-04-04 17:19:09 -04:00
Fox-McCloud
fe5f803476 forgot these two 2016-04-04 17:04:43 -04:00
Fox-McCloud
b7afdec18c defines 2016-04-04 17:01:03 -04:00
TheDZD
3bcbccdad6 Merge pull request #4082 from Fox-McCloud/weak-eyes
Fixes Weakeyes
2016-04-04 15:12:05 -04:00
Fox McCloud
71c30b879d Merge pull request #4083 from Aurorablade/MeteorOps2
MeteorOps Tweaks
2016-04-04 07:14:09 -04:00
Fox-McCloud
aee239c6e5 Sentience Potion Changes 2016-04-04 04:45:13 -04:00
Tastyfish
16c8e24f04 Tweaks/fixes some bot radio/language stuff, lazarus capsules 2016-04-04 02:02:19 -04:00
Fox-McCloud
3bd37ec757 Simple Animal Spawn Refactor 2016-04-04 00:30:10 -04:00
Crazylemon64
26a9f441ea MULEbots will now announce their deliveries to request consoles again 2016-04-03 17:02:40 -07:00
Fox McCloud
9e74cbcc1b Merge pull request #4090 from Tastyfish/bots23
Fixes mulebots killing passenger, bot tweaks
2016-04-03 17:48:39 -04:00
Tastyfish
b2d9c2e6a9 Fixes mulebots killing passenger, bot tweaks 2016-04-03 15:39:54 -04:00
Tigercat2000
e2442e7fc9 Add inactive hand to carbon get_access 2016-04-03 12:33:52 -07:00
Aurorablade
eb4ddb247d MeteorOps Tweaks 2016-04-03 01:54:51 -04:00
Fox McCloud
a30b5fbf75 Merge pull request #4076 from Aurorablade/ICUTYOU
Fixes IPC Embbedded object surgery
2016-04-03 01:24:28 -04:00
Fox-McCloud
b3b0abd95b Fixes Weakeyes 2016-04-03 01:19:49 -04:00
Tigercat2000
94ff8fc4ef whoops forgot to remove this 2016-04-02 21:32:11 -07:00
Aurorablade
e045e10268 remoing pasted line
i need to remove the rest of em later.
2016-04-02 23:42:14 -04:00
Aurorablade
279937c58b Fixes IPC Embbedded object surgery 2016-04-02 23:34:38 -04:00
Tigercat2000
b4eaf130b0 Merge remote-tracking branch 'upstream/master' into tgport-16569
Conflicts:
	.gitignore
2016-04-02 20:29:28 -07:00
Fox McCloud
c75aededf4 Merge pull request #4072 from Crazylemon64/slime_syringe_fix
Using a syringe on slime people will now get water out of them
2016-04-02 22:47:00 -04:00
Fox McCloud
752d106bef Merge pull request #4067 from tigercat2000/510staging
Merge branch 'byond510' into master
2016-04-02 22:44:00 -04:00
Tigercat2000
8e7c447646 Ports tgstation/-tg-station#16569, World Topic() changes
Full changes:
 - World Topic() is now standardized to use if("parameter" in topic_list)
   instead of an amalgamation of findtext() and if(topic == "parameter").
 - Comms password is now verified at the top of world/Topic() and sets a
   variable to true if it is present and correct.
 - "status" now returns extra information if the comms_password is
   provided and correct.

Misc changes:
 - Shuttle text has been standardized as a proc on mobile docking ports.
   This is used by status/supply displays and mob/Stat() for the -ETA- etc stuff.
2016-04-02 17:38:49 -07:00
Crazylemon64
93aa9c688a Using a syringe on slime people will now get water out of them 2016-04-02 16:59:53 -07:00
Fox McCloud
a42bcb53e3 Merge pull request #4061 from Aurorablade/AntagHudUpdates
Antag Hud updates
2016-04-02 04:13:20 -04:00
Fox McCloud
817b7928eb Merge pull request #4058 from FalseIncarnate/reagents
Reagent Container Tweaks
2016-04-02 04:12:23 -04:00
Fox McCloud
13200e7c62 Merge pull request #4049 from Aurorablade/FethasStaph
Fethas Carnival of Horrors:Fethas Please Stop
2016-04-01 20:43:06 -04:00
Fox McCloud
d7363f5ffb Merge pull request #4064 from VampyrBytes/trashNforks
Fixes forks producing trash/not leaving trash
2016-04-01 19:53:26 -04:00
Tigercat2000
7a41efd1da Last staging fixes 2016-04-01 16:09:43 -07:00