Cheridan
3aa76f80e9
Merge pull request #13080 from PKPenguin321/patch-4
...
HoG fountains now give an omnizine-like reagent instead of Doctor's Delight + Typo Fix
2015-11-19 22:43:12 -06:00
Razharas
52ce383102
Merge pull request #13053 from AnturK/doors
...
Makes staff of doors create random mineral doors.
2015-11-20 06:54:28 +03:00
Cheridan
2ebbeef108
Merge pull request #13108 from Incoming5643/I_didnt_even_have_to_touch_savefiles_to_break_them_this_time
...
Fixes species selection not saving properly between rounds
2015-11-19 21:30:28 -06:00
Cheridan
e9b0e5a148
Merge pull request #13095 from kingofkosmos/grabclickupgrade
...
Upgrade grab by clicking on grabbed mob
2015-11-19 20:56:55 -06:00
Cheridan
83f38f56ab
Merge pull request #13103 from tkdrg/igotcrabs
...
Fixes living mobs being pulled to brains or slugs
2015-11-19 19:54:06 -06:00
Cheridan
4c899d2b34
Merge pull request #13063 from Incoming5643/subtypesof
...
Adds subtypesof(path)
2015-11-19 16:31:09 -06:00
Cheridan
8994f03377
Merge pull request #13100 from KorPhaeron/harvester
...
Harvesters made by nar-sie are no longer made cultists (again)
2015-11-19 15:21:44 -06:00
Remie Richards
0710ce5def
Merge pull request #13070 from octareenroon91/patch-30
...
Introduce the four-color pen
2015-11-19 18:42:26 +00:00
Tkdrg
db7177ae66
Fixes living mobs being pulled to brains or slugs
...
Fixes #13069
2015-11-19 00:44:35 -03:00
Incoming
cb5401467d
Species selection wasn't saving properly. Why? Because species_list used id as a reference, but roundstart_species used name.
...
THESE AREN'T THE SAME THINGS.
Both lists now use id, and savefiles will properly look for/save said ids
2015-11-18 22:29:20 -05:00
octareenroon91
c183c660fc
Typo in four-color pen feedback
...
Change message starting, "pen will now write..."
Now it starts grammatically correct: "The pen will now..."
2015-11-18 16:36:42 -06:00
KorPhaeron
a6b286838e
Harvester
2015-11-18 15:43:22 -06:00
Remie Richards
7333bede43
Merge pull request #13055 from Anonus/actionbuttons
...
Gives constructs action buttons, adds cool effects to cult turfs.
2015-11-18 20:26:47 +00:00
kingofkosmos
6f324ca20a
Enables upgrading a grab by clicking the grabbed mob again. Alters the grab-messages a bit.
2015-11-18 20:30:36 +02:00
Cheridan
3b9bf12983
Update mob.dm
...
Readds comment
2015-11-18 01:48:45 -06:00
Cheridan
cba8a9a325
Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix
...
Conflicts:
code/modules/mob/mob.dm
2015-11-18 01:44:29 -06:00
oranges
6672cb0f5d
Synthflesh now correctly heals instead of kills
...
As funny as that what, it's not the intent, which was instead a slight nerf to synthflesh.
2015-11-18 16:39:05 +13:00
PKPenguin321
3d2bf3ae7b
adds godblood, child of omnizine
...
is identical to omnizine except that it has a 7.5x higher overdose threshold and has a new name/desc.
2015-11-17 18:10:16 -08:00
octareenroon91
5b429cf2fe
remove commented-out code from pen.dm
...
fine
2015-11-17 18:43:40 -06:00
octareenroon91
33350bffe6
Four-color pen code improvement.
...
Take advantage of inheritance; use defaults instead of New()
2015-11-17 13:07:22 -06:00
Razharas
3978e087ec
Merge pull request #13040 from MrStonedOne/patch-63
...
Makes external archive only show pages of 250 books
2015-11-17 20:21:45 +03:00
Nerd Lord
a183e0474d
Pooling is good for the soul.
2015-11-17 11:27:26 -05:00
AnturK
b1bf6acab0
Changes spellbook description
...
Picks types from list
2015-11-17 15:17:46 +01:00
Cheridan
183f3fa0c5
Merge pull request #13032 from Incoming5643/guide_to_the_races_of_star_wars
...
Roundstart races as a config
2015-11-16 22:27:26 -06:00
Razharas
822d085f6a
Merge pull request #13044 from KorPhaeron/curvethebullet
...
Stops projectiles being blown away by spacewind
2015-11-17 06:06:25 +03:00
octareenroon91
4a5cda8a8b
Introduce the four-color pen
...
Add a fancy pen that lets you choose between black, red, green, and blue ink.
2015-11-16 20:14:30 -06:00
Incoming
1f9f0dfc40
Adds subtypesof(). It's shorthand for typesof(path) - path.
...
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
duncathan salt
621c9e28c1
Merge pull request #13062 from optimumtact/chemchanges
...
Chemistry Balancing and Additions
2015-11-16 17:42:08 -06:00
Razharas
389f4e3779
Fixes bloodpacks
...
Fixes bloodpacks
2015-11-17 01:10:41 +03:00
Nerd Lord
3f1a28869f
A STRONG INDEPENDENT ELDER GOD THAT DOESN'T NEED NO MACHINES
2015-11-16 17:08:25 -05:00
Razharas
fd531118f4
Merge pull request #13037 from bgobandit/bloodlabels
...
Adds the ability to label blood packs.
2015-11-17 01:07:06 +03:00
Razharas
7489f929f2
Merge pull request #12964 from GunHog/Nanotrasen_Pindication
...
Reduces Loyalty Firing Pin tech requirement
2015-11-17 00:59:41 +03:00
bgobandit
4dee16a13d
canusetopic for ayyranclmaos
2015-11-16 16:53:19 -05:00
Kyle Spier-Swenson
ad2cf316e5
Fixes compile error in library computers from me coding while too high
2015-11-16 13:01:34 -08:00
Nerd Lord
91095f57ce
Constructs now have action buttons!
...
Cult floors and walls now have a glow effect when spawning in.
Nar-Sie uses a span class just for it spawning. Get spook.
2015-11-16 15:21:41 -05:00
Nerd Lord
757d009e4f
Constructs now have action buttons!
...
Cult floors and walls now have a glow effect when spawning in.
Nar-Sie uses a span class just for it spawning. Get spook.
2015-11-16 15:20:13 -05:00
AnturK
05ff5552b2
Makes staff of doors create random mineral doors.
2015-11-16 21:10:34 +01:00
GunHog
a254c87e35
Reverts the removable change.
2015-11-16 09:59:45 -06:00
Razharas
e9dae3be88
Merge pull request #13015 from SuperSayu/Holodecker
...
Holodeck Upgrades [MAP]
2015-11-16 04:51:49 +03:00
KorPhaeron
ff7b7535e8
Spacewind fix
2015-11-15 19:35:19 -06:00
Vincent
faf5ddaceb
Holodeck refactor and Enchancements
...
Moves holodeck code to modules/holodeck. Repaths holodeck structures a little. Cleans holodeck code and prepares for additional features (multiple holodecks, etc). Should fix #4828 .
Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.
All items spawned by the holodeck will do only stamina damage, except when emagged. This allows emergency medical to be staffed with scalpels and bonesaws and such. Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05:00
Razharas
70391716e7
Merge pull request #12400 from bgobandit/cakehatbugs
...
Cake hats now properly emit light.
2015-11-16 03:01:07 +03:00
Kyle Spier-Swenson
405b8b8284
Fixes some more compile errors in library computers
2015-11-15 15:37:36 -08:00
Kyle Spier-Swenson
aa3040003a
Fixes library computers missing a var breaking compiling.
2015-11-15 15:18:39 -08:00
Kyle Spier-Swenson
818dc2e9b4
Makes external archive only show pages of 250 books
...
250 because any less seemed like you would have to page too much to browse the archive.
All actions preserve the current page.
Page splitting and calculation is cached on first load of the external archive for that computer (has to be per-computer because the html is cached and it needs to have the src arg)
2015-11-15 15:13:35 -08:00
duncathan salt
30ea5ba36d
Merge pull request #13026 from Anonus/blightmode
...
Revenant Changes LXIX
2015-11-15 16:01:11 -06:00
duncathan salt
7f48bf70f5
Merge pull request #13027 from tkdrg/FUK
...
Pickup() improvements
2015-11-15 15:59:05 -06:00
bgobandit
f01fd1f942
Adds the ability to label blood packs.
2015-11-15 16:45:43 -05:00
bgobandit
5cdeabe0a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into cakehatbugs
...
Conflicts:
code/modules/clothing/head/misc_special.dm
2015-11-15 16:30:03 -05:00
Cheridan
0baf7610dd
Merge pull request #12999 from Anonus/grillby's
...
Plasmamen can now man the bar
2015-11-15 14:26:58 -06:00