Commit Graph

5449 Commits

Author SHA1 Message Date
Bjorn Neergaard
4e5edf396a Update NanoUI
* Update NanoUI to the latest version, ported from Baystation12
* Update the Air Alarm UI
* Make changes to subsystems and some machines to make the new NanoUI
work
2015-11-26 07:11:27 -05:00
Aranclanos
be5d864640 Merge pull request #13176 from neersighted/borg_toner
Make Cyborg Toner refillable by Rechargers.
2015-11-26 08:32:39 -03:00
YotaXP
9fe9c2faa4 Remove side effects from Character Setup 2015-11-25 18:06:05 -05:00
Cheridan
9bc2b0a8cc Merge pull request #13191 from Anonus/logmymemes
Revenant say and transmit now log
2015-11-25 11:18:49 -06:00
Cheridan
8a595c4cb5 Merge pull request #13184 from YotaXP/char-preview
Accurate Character Setup Preview
2015-11-24 18:48:30 -06:00
Razharas
1ed275b096 Merge pull request #12719 from KorPhaeron/zombiefix
Fixes zombie infection holders
2015-11-25 02:29:47 +03:00
Razharas
41b5776893 Merge pull request #13174 from optimumtact/if_cat_parts_are_fine_then_this_is_too
Adds tarajan race to the game
2015-11-24 18:02:27 +03:00
Nerd Lord
e9e5f28ca7 Revenant say and transmit now log(thanks xhuis, copying alien whisper but without the logging)
This means you can goad someone into doing stuff and they won't get bant for it because they can say the revenant did it and have the logs to prove it(and in turn, you can't use the excuse "the revenant said to do it" when it totally didn't you liar)
2015-11-23 23:49:37 -05:00
Aranclanos
705ddc79d2 Merge pull request #13057 from tkdrg/fiah
Fixes the maxbodytemp of some simple_animals
2015-11-23 20:22:44 -03:00
YotaXP
76acfe4349 Rewrote the character setup preview icon code 2015-11-23 17:34:31 -05:00
Bjorn Neergaard
b5113aa5f8 Make Cyborg Toner refillable by Recharging Stations.
Closes #13073
2015-11-23 09:55:06 -05:00
oranges
268d2f0522 Adds tarajan race to the game
as a retardation meme reference
2015-11-23 18:48:02 +13:00
Nerd Lord
1c2c00759d oh wait I shouldn't have done that anyway
revenants don't get nar-sied sorry lady you'll have to eat something else
2015-11-22 12:13:34 -05:00
Nerd Lord
4ed2730155 TODO: rewrite all of event code so you can check if the event can run in the first place. 2015-11-20 20:02:08 -05:00
Nerd Lord
00e7cf9836 Fixes #11442 and tweaks the icon update to use WIZARDRY
Also fixes the event possibly using up all chances to occur if there are too few dead mobs.
2015-11-20 19:51:34 -05:00
Cheridan
7595a4b728 Merge pull request #13125 from phil235/NoDoubleChemHandling
Fixes human having two handle_chemicals_in_body() procs.
2015-11-20 17:29:12 -06:00
Cheridan
a88503cfca Merge pull request #13115 from bgobandit/dronedetox
Drones no longer receive toxin damage.
2015-11-20 17:06:03 -06:00
Cheridan
f2988045da Merge pull request #13036 from AnturK/fixx
Some visibility fixes
2015-11-20 17:04:05 -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
phil235
c1410d15f8 Fixes human having two handle_chemicals_in_body() procs. 2015-11-20 00:21:53 +01: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
bgobandit
89316bf527 Drones no longer receive toxin damage. 2015-11-19 11:33:40 -05:00
Tkdrg
db7177ae66 Fixes living mobs being pulled to brains or slugs
Fixes #13069
2015-11-19 00:44:35 -03: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
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
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
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
Tkdrg
436c3cacad Fixes the maxbodytemp of some simple_animals
Fixes #12463 (the bug claims that they catch on fire, but that is
untrue, they were being damaged by temperature only)
2015-11-16 12:21:53 -03:00
KorPhaeron
d735bec085 Invisible 2015-11-16 03:05:51 -06:00
Razharas
e9dae3be88 Merge pull request #13015 from SuperSayu/Holodecker
Holodeck Upgrades [MAP]
2015-11-16 04:51:49 +03: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
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
Cheridan
0baf7610dd Merge pull request #12999 from Anonus/grillby's
Plasmamen can now man the bar
2015-11-15 14:26:58 -06:00
AnturK
90dc10f2e2 Fixes HoG gods being visible to silicons 2015-11-15 20:35:00 +01:00
AnturK
8f4cbf12e5 Fixes revanant visibility for ghosts 2015-11-15 19:33:12 +01:00
Aranclanos
37ac44e9d6 Merge pull request #12985 from tkdrg/fuckme
Fixes posibrain ghost alert
2015-11-15 03:57:59 -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
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
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