Tastyfish
d56bf196a8
in for loops
2016-04-16 01:52:03 -04:00
Tastyfish
178912db73
Makes the startup time significantly faster
2016-04-16 00:58:20 -04:00
FalseIncarnate
bdd379c5a2
Fixes Anomalies Not Neutralizing
...
Fixes #4167
2016-04-15 00:12:42 -04:00
TheDZD
341034e37d
Refactors hostile mob code, unsnowflakes bears, panthers, and snakes
...
Also fixes some bee stuff.
2016-04-14 20:36:45 -04:00
TheDZD
eba294357a
It's the bees
2016-04-14 20:30:30 -04: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
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
FalseIncarnate
6654767cd2
Burnt match bugfix
...
Fixes burnt matches being able to light cigs and such.
2016-04-10 00:10:58 -04:00
FalseIncarnate
990c83c6bb
Revert "Vendor and Pipe Changes"
...
This reverts commit d21168fb38
2016-04-09 23:38:36 -04:00
Tastyfish
632595ce38
Tweaks
2016-04-09 16:00:59 -04:00
Tastyfish
7d259d35c7
Ports SNPCs
2016-04-09 00:10:01 -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
TheDZD
8ad5e18757
Merge pull request #4112 from Fox-McCloud/xenobio-overhaul
...
Xenobio Refactor/Changes
2016-04-07 17:54:33 -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
Fox-McCloud
3f7f6704c8
Xenobio Refactor/Changes
2016-04-06 01:37:04 -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
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
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
b3b0abd95b
Fixes Weakeyes
2016-04-03 01:19:49 -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
Fox McCloud
817b7928eb
Merge pull request #4058 from FalseIncarnate/reagents
...
Reagent Container Tweaks
2016-04-02 04:12:23 -04:00
Tigercat2000
7a41efd1da
Last staging fixes
2016-04-01 16:09:43 -07:00
Tigercat2000
519992b5a9
Merge branch 'byond510'
...
Conflicts:
.travis.yml
code/game/jobs/access.dm
code/game/machinery/camera/camera.dm
code/game/machinery/flasher.dm
code/game/machinery/vending.dm
code/game/objects/items/devices/laserpointer.dm
code/game/objects/items/weapons/grenades/flashbang.dm
code/game/objects/items/weapons/tools.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/life.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/mob/living/simple_animal/bees.dm
code/modules/nano/modules/virus2_creator.dm
code/modules/virus2/disease2.dm
code/modules/virus2/diseasesplicer.dm
paradise.dme
2016-04-01 14:15:44 -07:00
FalseIncarnate
777f8cbfb6
Beaker and Pill Bottle Labeling
...
Can now label Pill Bottles with pens, just like Beakers
Beakers (and pill bottles) can now accept 26 character labels from pens.
2016-04-01 15:17:47 -04:00
Fox McCloud
80ae4bff80
Merge pull request #4045 from ProperPants/Cyborg_Stacks
...
Cleaning and Definition of Cyborg Stacks
2016-03-31 22:24:19 -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
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
Fox McCloud
d1765e0e14
Merge pull request #4019 from tigercat2000/disease1
...
-tg- disease1
2016-03-30 21:29:58 -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
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
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
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
