Commit Graph

24890 Commits

Author SHA1 Message Date
KorPhaeron 3ffee29ba7 Adds a missing \ 2016-02-07 11:29:31 -06:00
Tkdrg 164335ee8c Adds a minimum account age for drones
Currently two weeks. Experience on basil has proven the need for this.
2016-02-07 14:19:54 -03:00
duncathan salt 94b91bcf57 Merge pull request #14947 from KorPhaeron/xenomorph
Adds the Lusty Xenomorph Maid
2016-02-07 10:08:12 -06:00
duncathan salt 56a4b89400 Merge pull request #15237 from AnturK/botfixfix
Fixes bot fixing
2016-02-07 10:06:53 -06:00
AnturK ed47afaa05 Fixes crayon/spraycan buffer mode. 2016-02-07 13:18:10 +01:00
Bjorn Neergaard 4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
Incoming5643 1c62b22cc7 4 am missing commit for the extra space 2016-02-07 04:25:00 -05:00
Incoming b5a7c2c19c Moves how poly tracks his lifetimes out of Write_Memory() to avoid some weird edge cases where poly could be accidentally credited with living while dead.
The only in game side effect of this pull is that if poly dies in a round and later is revived somehow his streak will still be broken.

Fixes a spacing error I missed.

Changes the savefile names of the round survival mechanics, as the existing ones are somewhat spoiled by the bug I'm fixing.
2016-02-07 04:21:07 -05:00
Bjorn Neergaard ddab6823d3 Fix up crates
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
Bjorn Neergaard ede93b63a6 Put shuttles in their proper place, split out secure crates 2016-02-07 01:18:56 -06:00
Cheridan 1449640867 Merge pull request #15247 from ChangelingRain/revert-15182-complexanimals
Revert "Simple animal force threshold no longer converts damage to brute"
2016-02-06 20:32:21 -06:00
tkdrg 90b5a5bfa5 Merge pull request #15154 from AnturK/brig_timers
Brig door timer tgui
2016-02-06 23:13:13 -03:00
KorPhaeron 143ae442d6 Sprites 2016-02-06 20:06:48 -06:00
Nerd Lord 7369a3a92e proc to set random blob chemical, instead of having the verb do it 2016-02-06 21:00:06 -05:00
PKPenguin321 af0a05d55a halves most tablecrafting times
pretty much anything that was already below 20 was left alone
2016-02-06 17:55:07 -08:00
bgobandit cca610f1e4 Adds shots of wine and other things. 2016-02-06 20:54:09 -05:00
tkdrg ed014be6f2 Merge pull request #15183 from Incoming5643/everybodys_heard_about_the_bird
Edict from the bird: "I've run out of jokes"
2016-02-06 22:49:06 -03:00
KorPhaeron 37c0b23483 New CTF gear 2016-02-06 19:38:47 -06:00
Nerd Lord 75bb04d35a less 4-hit crits okay 2016-02-06 20:32:49 -05:00
PKPenguin321 9984f4e84c gives chameleon jumpsuits armor 2016-02-06 17:27:24 -08:00
Nerd Lord a2b05e14ef Updates Penetrating Spines color, Reactive Gelatin damage. 2016-02-06 19:48:51 -05:00
Nerd Lord c28c1203cd Adds five new blob chemicals.
Blob mobs now heal for 2.5% of their maxhealth when blob_act()ed, basically whenever they're on the blob
Blob expansion no longer has a chance to fail inversely proportional with the expanding blob's health.
Blobbernauts have slight color differences.
2016-02-06 19:32:30 -05:00
bgobandit 8ae0bbab89 Beepsky now drops an actual whiskey shot upon death. 2016-02-06 19:23:18 -05:00
Incoming5643 b897507e73 Roll back the shuffle chance for the speech buffer
I wasn't aware this code ran every life tick!
2016-02-06 18:53:27 -05:00
Incoming 7939d069dc Feeding poly crackers (existing mechanic) will now boost his speak chance permanently
Some arbitrary renaming of the new savefile vars

makes what was essentially a prob call a prob call.
2016-02-06 18:50:23 -05:00
Nerd Lord 86f7b98baf Revert "Simple animal force threshold no longer converts damage to brute" 2016-02-06 17:25:44 -05:00
Bjorn Neergaard 6c4d749599 Fix missing parent calls in portable atmos 2016-02-06 15:26:16 -06:00
phil235 95d279a4a4 Removing the true_changeling.dm file that I added by mistake.
renamed "nearsight" fullscreen to "nearsighted"
2016-02-06 22:23:13 +01:00
KorPhaeron ce53241cf3 But this time it actually compiles 2016-02-06 14:46:14 -06:00
KorPhaeron 688276008d Updated desc 2016-02-06 14:37:11 -06:00
KorPhaeron 9daab124b2 Merge remote-tracking branch 'refs/remotes/tgstation/master' into instagib 2016-02-06 14:25:43 -06:00
phil235 99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/modules/reagents/chemistry/holder.dm
2016-02-06 20:38:16 +01:00
tkdrg f00e9588fd Merge pull request #14992 from KorPhaeron/flashlights
Adds laserguns with rechargeable, swappable magazines
2016-02-06 16:36:03 -03:00
phil235 20bf41a05d Fixes fullscreen overlay not appearing on login. 2016-02-06 20:35:43 +01:00
phil235 aed7794f50 Made changes to adjust with neersighted's fullscreen overlays pr.
Fixed Xray users getting vision impairment overlays when inside a container.
Fixes mob inside mecha getting the mech sight flags despite not being the pilot.
"get_vision_impairments" is renamed to "get_remote_view_fullscreens".
Fixes AI blindness.
2016-02-06 20:35:15 +01:00
tkdrg e6cb39624e Merge pull request #15208 from KorPhaeron/pinpointer
Gives ops pinpointers by default
2016-02-06 16:27:25 -03:00
KorPhaeron ee3892f20d Consistency in pinpointer placement 2016-02-06 13:19:52 -06:00
tkdrg 4e34ca775e Merge pull request #15219 from neersighted/reagents_aaaaaaa
Speed reagent reaction code
2016-02-06 16:15:50 -03:00
KazeEspada b75bea58b1 *click* 2016-02-06 11:15:47 -07:00
Bjorn Neergaard d1f748b09c comment style is important 2016-02-06 12:15:21 -06:00
KorPhaeron 66f8d450ac Chaplain weapon code cleanup 2016-02-06 12:10:48 -06:00
KorPhaeron 9b9da55178 Removes excess pinpointers 2016-02-06 11:37:29 -06:00
tkdrg 7b602a35b5 Merge pull request #15217 from neersighted/flashy
Fix flashlights flashing
2016-02-06 14:21:14 -03:00
tkdrg 0dbbcce675 Merge pull request #15216 from KorPhaeron/fixes_bulldogs
Fixes bulldogs being unable to load special ammo
2016-02-06 14:19:35 -03:00
KorPhaeron 902b5d2db1 Fixes update icon 2016-02-06 11:19:21 -06:00
TrustyGun 99f2200d10 doh 2016-02-06 10:58:56 -05:00
TrustyGun 55f9adfa87 The janitor's belt can now hold his keys
This always bothered me.
2016-02-06 10:41:38 -05:00
KorPhaeron 9f659fd0d0 Adds an easy way for admins to enable instagib mode 2016-02-06 08:55:59 -06:00
phil235 fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
2016-02-06 15:42:13 +01:00
AnturK 7075b1f161 Fixes bot repair 2016-02-06 14:27:49 +01:00