Commit Graph

11345 Commits

Author SHA1 Message Date
Mieszko Jędrzejczak 4692f3f0a4 Shoots glasses 2016-04-14 20:54:02 +02:00
Fox McCloud ad126c11f9 Merge pull request #4200 from VampyrBytes/FixesDNAModifier
Fixes DNA Modifier using refs instead of copies
2016-04-14 06:26:35 -04:00
VampyrBytes 049b5165c5 Fixes DNA Modifier using refs instead of copies
fixes #4193

Transfer button and block injectors now make copies instead of using
references
2016-04-14 10:55:55 +01:00
Fox McCloud f923c3d4ff Merge pull request #4153 from pinatacolada/sop-books
Adds SOP books
2016-04-12 03:29:03 -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 f4df310f1d Merge pull request #4166 from Tastyfish/mulehouse
Fixes MULEs not coming out of their shell.
2016-04-11 19:29:04 -04:00
Tastyfish 68b936f0e1 Fixes girder animal smash messages 2016-04-11 13:51:31 -04:00
pinatacolada b30b826e21 forgot legal and standard sop oops 2016-04-11 16:10:05 +01:00
Tastyfish 5f87411850 Fixes MULEs not coming out of their shell. 2016-04-11 04:17:32 -04:00
TheDZD 6404a5ee97 Merge pull request #4149 from Fox-McCloud/monkey-runtime
Fixes Monkey Recycler Runtime
2016-04-10 20:43:21 -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
pinatacolada b75bc658db typo 2016-04-10 21:44:31 +01:00
pinatacolada 06d7c325ea thought i had this fixed 2016-04-10 21:21:27 +01:00
pinatacolada b5768f485c Adds SOP books
Adds SOP books to the corresponding departments and department head's
offices. Rep and IAA have a brand spanking new shelf with all the SOP
books.

Also right now it's using generic book sprites because I couldn't sprite
even if my life depended on it, maybe someone could sprite something
nice for them?

Also fixed a random < that was just kinda there out in nowhere in an
atmos book
2016-04-10 21:16:29 +01:00
Tastyfish a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -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 6654767cd2 Burnt match bugfix
Fixes burnt matches being able to light cigs and such.
2016-04-10 00:10:58 -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
Fox-McCloud 135a83e876 Fixes Monkey Recycler Runtime 2016-04-09 22:55:42 -04:00
TheDZD 9ecf552708 Merge pull request #4127 from Fox-McCloud/traitor-vamp
Traitor Vamp
2016-04-09 22:17:15 -04:00
TheDZD 8f635d1a4f Merge pull request #4134 from Fox-McCloud/malf-ai-z-level-change
Malf AI Z-Level Change
2016-04-09 21:59:41 -04:00
Tastyfish 632595ce38 Tweaks 2016-04-09 16:00:59 -04:00
Tastyfish 20f8ca1095 Fixes meals prepared / food eaten scoreboard stats 2016-04-09 02:28:53 -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
Fox-McCloud 2ec556e994 population adjustments 2016-04-08 20:10:39 -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 dfe5ea5277 Malf AI Z-Level Change 2016-04-08 01:18:15 -04:00
Fox-McCloud 6965d43aab tweaks 2016-04-07 23:45:03 -04:00
TheDZD 8ad5e18757 Merge pull request #4112 from Fox-McCloud/xenobio-overhaul
Xenobio Refactor/Changes
2016-04-07 17:54:33 -04:00
Fox-McCloud bea90a5cd1 monkey recycler QoL 2016-04-07 09:29:54 -04:00
Fox-McCloud 4d58019d69 Traitor Vamp 2016-04-07 08:45:44 -04:00
Aurorablade b58006db4e vrooom 2016-04-07 00:48:27 -04:00
Tastyfish 85a58e59a6 Fixes to_chat script fuckery 2016-04-06 20:41:45 -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 3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -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
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 e5bc348342 Merge pull request #4096 from Fox-McCloud/tape
Adds Tape to ArtVend
2016-04-05 18:34:40 -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