bgobandit
2fd13edef2
Adds hivelord stabilizer. Fixes a bug.
2015-11-18 22:04:01 -05:00
bgobandit
899e6ecaf9
Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear
...
Conflicts:
_maps/map_files/DreamStation/dreamstation04.dmm
2015-11-18 19:55:06 -05:00
bgobandit
b928b8ec18
fixes memestation, ups ore points slightly
2015-11-18 19:51:49 -05:00
bgobandit
bb397fcc0d
fixes bluespace crystal related bug
2015-11-18 19:32:20 -05:00
bgobandit
47dcbc2fd0
Various mining additions, fixes and rebalances.
2015-11-18 19:14:28 -05: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
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
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
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
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
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
Cheridan
caa7adeeba
Merge pull request #13022 from tkdrg/morefix
...
R&D and Misc Fixes/Tweaks
2015-11-15 14:19:44 -06:00
Aranclanos
37ac44e9d6
Merge pull request #12985 from tkdrg/fuckme
...
Fixes posibrain ghost alert
2015-11-15 03:57:59 -03:00
Aranclanos
b1b5e73907
Merge pull request #13018 from Cheridan/my_b
...
Fixes warning in anomaly_pyro.dm
2015-11-15 03:36:02 -03:00
Razharas
62cd83fa30
Merge pull request #12778 from AnturK/minor_upgrades
...
Mech Speech Bubbles, POI list for Observe
2015-11-15 09:07:21 +03:00
duncathan salt
328c9537e7
Merge pull request #13013 from tkdrg/bugs
...
Logging improvements
2015-11-14 23:45:45 -06:00
duncathan salt
a2a3a471c7
Merge pull request #13000 from hornygranny/master
...
wastes a get
2015-11-14 23:44:20 -06:00
duncathan salt
f26a4fa106
Merge pull request #12992 from phil235/ProjectileSuicideFixes
...
Fixes your shield blocking the bullets when committing suicide with a
2015-11-14 23:43:55 -06:00
Nerd Lord
e7e10c1b7c
If H and memes...
2015-11-14 23:24:36 -05:00
Xhuis
13a5fdb184
Makes atropine multiplication less hideous
2015-11-14 23:18:20 -05:00
Xhuis
727eda41e8
Restores old healing values to Restorative Nanites
2015-11-14 23:15:13 -05:00
Incoming
1e2892bf31
There is now a config list in game_options.txt of which races should be playable at roundstart.
...
If the list is missing, it will default to which races are defined as roundstart in the species datums. Plasmamen have been removed from this list pending bugfixes.
If JOIN_WITH_MUTANT_RACE isn't set in config, humans only will still be enforced regardless.
2015-11-14 22:27:55 -05:00
Xhuis
d51813a48f
Chemistry rebalances and additions
2015-11-14 22:17:54 -05:00
Nerd Lord
b91e32d0c3
Improves revenant ability sprites further.
...
Also tweaks icon proc slightly so it's easier to do testing stuff.
2015-11-14 20:56:11 -05:00
Remie Richards
ff26ef3fff
Merge pull request #13009 from MrStonedOne/patch-62
...
[Ready] Fixes map loader incorrectly detecting x size in maps
2015-11-15 01:20:04 +00:00
Tkdrg
11ab5901ee
Pickup() improvements
...
Fixes flashlight exploit.
Removes unused proc can_use_hands().
Fixes #11282
2015-11-14 17:05:08 -03:00
