Commit Graph

5681 Commits

Author SHA1 Message Date
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
as334 c98a7a0d7e Fixes merge conflicts, also a minor slipup with flags 2015-11-17 20:59:43 -05:00
as334 160506b401 Unfucking shit ass plasma memes part 2 2015-11-17 20:38:56 -05:00
Nerd Lord a183e0474d Pooling is good for the soul. 2015-11-17 11:27:26 -05:00
Shadowlight213 90ccd86130 Adds ability for syndie mobs to attack crit people. 2015-11-16 22:32:44 -08: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
YotaXP 4ece522dff Removed snowflake. 2015-11-15 02:34:17 -05: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
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
Tkdrg 11ab5901ee Pickup() improvements
Fixes flashlight exploit.
Removes unused proc can_use_hands().

Fixes #11282
2015-11-14 17:05:08 -03:00
Nerd Lord c04946908f Commit efficiency: low. 2015-11-14 14:46:44 -05:00
Nerd Lord bffa938df9 continue 2015-11-14 14:44:42 -05:00
Nerd Lord 1ff4f00791 The changelog is the PR, but:
Defile no longer directly affects mobs. Instead, it rips up floors and opens machines and lockers.
Blight added. Blight infects humans with a virus that does a set amount of damage over time and is relatively easily cured. Blight also badly affects nonhuman mobs and other living things.
Tweaked costs and stuntimes again.
Transmit has a new, spookier icon.
2015-11-14 14:13:12 -05:00
as334 ef6af4ef5b Unfucking shit ass plasma memes part 1 2015-11-13 21:28:00 -05:00
Shadowlight213 7a1223094f buffs syndicate simple mobs 2015-11-12 21:32:40 -08:00
hornygranny b5e12f9faf wastes a get
wastes a get
2015-11-12 19:45:06 -08:00
Nerd Lord cd31b8d74b Plasmamen can now man the bar. 2015-11-12 22:38:10 -05:00
as334 d39982e98a Small tweak for Cheridan 2015-11-12 22:09:26 -05:00
as334 a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug. 2015-11-12 21:54:08 -05:00
YotaXP 47c358e8e2 Adds slot_drone_storage macro. 2015-11-12 20:32:00 -05:00
phil235 5268a2613f Merge pull request #12994 from phil235/ReagentObfuscation2
Reagent obfuscation (copy)
2015-11-12 23:25:55 +01:00
Xhuis e02831d5b1 Reagents can no longer be determined by examining a reagent container without the proper apparatus. Silicons and ghosts can always see reagents.
Science goggles now allow reagents to be seen on examine. In addition, chemists now start wearing them. The bartender has a pair that looks and functions like sunglasses.
2015-11-12 23:01:33 +01:00
duncathan salt df6ac90baa Revert "Revert "Merge pull request #12067 from AnturK/resequencing"" 2015-11-12 15:25:31 -06:00
phil235 9e3b7610ff Merge pull request #12959 from tkdrg/abranch
Fixes adjust_fire_stack to work with macro Clamp()
2015-11-12 20:15:06 +01:00
phil235 e20e03562a Fixes your shield blocking the bullets when committing suicide with a gun.
Merged kill_count and range var into one var/range for obj/item/projectile.
Simplified projectile/proc/Range().
Fixes timestoped projectiles still calling Range() and thus being deleted despite being stopped.
Fixes projectile being invisible when on the first tile in front of the shooter (which meant no sprite showing when shooting a target 1 tile away)
Simplifies kinetic/Range()
2015-11-12 19:45:50 +01:00
Razharas 3992858ed1 Revert "Merge pull request #12067 from AnturK/resequencing"
This reverts commit d5fd4440ea, reversing
changes made to 605710d0ec.

Reverting this bullshit
2015-11-12 21:11:50 +03:00
Tkdrg fdccdb6ab9 Fixes posibrain ghost alert
Yes, I did put the args in the wrong order. Kill me.
2015-11-12 02:30:51 -03:00
duncathan salt 4fcdc7d748 Merge pull request #12950 from phil235/AIMechStunFix
Fixes flashbanged mmis in mechs losing access to most mech functions
2015-11-11 16:34:24 -06:00
duncathan salt b1d1ecb81f Merge pull request #12904 from Incoming5643/action_action_action_action_action
Adds action buttons for slimes
2015-11-11 15:21:05 -06:00
Incoming5643 5c5c24380e ayy 2015-11-11 16:04:05 -05:00