kingofkosmos
2e4a8fcce8
Recieve --> receive grammarfix
...
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.
Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
Jordie
5be93a2b1a
Merge pull request #8635 from Xhuis/phazon_nerf
...
Phazon construction nerf
2015-04-02 20:27:32 +11:00
Jordie
a8a2ffc123
Merge pull request #8662 from phil235/AddBloodFix
...
Fixes lack of dna in old blood.
2015-04-02 20:25:38 +11:00
Jordie
32e7e5444a
Merge pull request #8665 from Xhuis/malf_z_nerf
...
Causes malfunctioning AIs who leave the station to lose the round
2015-04-02 20:25:26 +11:00
Jordie
475fce8da1
Merge pull request #8639 from Incoming5643/its_time_to_get_hard
...
Traitors can now buy blood-red hardsuits for 8 TC
2015-04-02 20:24:14 +11:00
Jordie
4c1c55906f
Merge pull request #8666 from phil235/AnimalsUpdatehealthFix
...
Fixes simple_animals being immune to fire damage melee attacks.
2015-04-02 20:16:18 +11:00
Jordie
57e1274353
Merge pull request #8624 from Cheridan/day42_betsoff
...
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
dannno
6e83015145
fixes critical priority bug
...
jesus christ think of all those g's. jesus fucking christ. what have we done
2015-04-01 21:49:14 -04:00
hornygranny
35498dc200
Merge pull request #8686 from sawu-tg/npcpool
...
Fixes to SNPCs
2015-04-01 11:47:57 -07:00
Sawu
799eadb6c8
Fixes to SNPCs
...
* Fixes two runtimes (stat menu and taking a delegate/assistant)
* Fixes SNPCs not being inserted into the NPCPool
* Makes the NPCPool fire more often for maximum robustness.
2015-04-02 05:19:21 +11:00
Swag McYolosteinen
e886207f58
Merge pull request #8684 from Cheridan/chem_farts
...
AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL
2015-04-01 18:29:25 +02:00
Cheridan
24038dc5b9
Merge pull request #8626 from Incoming5643/Blobbed_the_fuck_out
...
Fixes a pair of blobugs
2015-04-01 08:54:14 -05:00
Cheridan
3ac4d299c9
Merge pull request #8657 from Jordie0608/thisdrillisalsobrokenbutforadifferentreason
...
Reworks cyborg drill's power usage handling and fixes recharging
2015-04-01 08:25:46 -05:00
Cheridan
483c5691fb
Merge pull request #8658 from optimumtact/patch-1
...
Remove an infinite loop in getFlatIcon
2015-04-01 08:18:27 -05:00
Cheridan
053046c970
typo fix
2015-04-01 06:28:23 -05:00
Jordie
7610f83ba0
Merge pull request #8641 from Incoming5643/goddamn_it
...
Fixes a bug in mulligan antag where it would pick extended too much (yes another one)
2015-04-01 18:45:11 +11:00
Jordie
691411c76c
Merge pull request #8648 from Cheridan/collared
...
Fixes collar stuff
2015-04-01 18:45:02 +11:00
Jordie
2484674261
Merge pull request #8651 from xxalpha/atmosuitfix
...
Fixes atmos hardsuit pathing.
2015-04-01 18:44:49 +11:00
Jordie
904b27dcd7
Merge pull request #8607 from Iamgoofball/fuck
...
Fixes *flip
2015-04-01 18:44:20 +11:00
Jordie
b9753b8bb9
Merge pull request #8519 from dannno/WEEEOOOOWEEEEOOOO
...
WEEEOOOO WEEEEOOO WEEEOOO
2015-04-01 18:43:43 +11:00
Iamgoofball
86a1c9927a
removes feedback msg, fixes checks
2015-03-31 20:13:09 -07:00
hornygranny
89fd1ba9c4
Merge pull request #8595 from ACCount12/dredd
...
Firing pins update
2015-03-31 16:34:35 -07:00
Xhuis
343ea47778
Replace delay with round end
2015-03-31 17:23:00 -04:00
phil235
9261196b4f
Fixes simple_animals being immune to fire damage melee attacks.
...
Fixes slime being able to latch onto other slimes with mouse_drop (but not the feed verb)
2015-03-31 21:29:34 +02:00
Xhuis
2799af262f
Fixes oversight
2015-03-31 15:17:28 -04:00
Xhuis
10bf3f0bed
Malf AI off z-level nerf
2015-03-31 15:16:34 -04:00
phil235
0b403b3b03
Fixes lack of dna in old blood.
...
Fixes some comments about blood procs in atoms.dm
Small tweak in xeno blood blood_DNA.
2015-03-31 19:48:44 +02:00
Swag McYolosteinen
d8c588867a
Merge pull request #8634 from sawu-tg/master
...
See #7217
2015-03-31 19:40:33 +02:00
dannno
d1eb8fcaec
Merge branch 'master' of https://github.com/tgstation/-tg-station into WEEEOOOOWEEEEOOOO
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-03-31 13:01:09 -04:00
Orange Borg
e301667369
Remove an infinite loop in getFlatIcon
...
It's unlikely that this could ever be triggered but it's worth doing
Credit to report from
https://github.com/ParadiseSS13/Paradise/issues/596
2015-04-01 00:10:24 +13:00
Jordie
005c519b94
Merge pull request #8622 from phil235/TableclimbKnockFix
...
Fixes tableclimber knocking themself off the table when clicking it mid-climb
2015-03-31 22:06:51 +11:00
Jordie0608
d2600d8ea2
whoops
2015-03-31 21:51:48 +11:00
Jordie0608
e70134a37a
made warning function not really dumb
2015-03-31 21:49:07 +11:00
Jordie0608
879659a3d1
cyborg drills use internal battery first + charging fix
2015-03-31 21:24:48 +11:00
Jordie
b62eb672da
Merge pull request #8618 from Xhuis/my_ears_they_bleed
...
Separates ship ambience and area ambience
2015-03-31 19:16:59 +11:00
Jordie
2d94da8e59
Merge pull request #8592 from phil235/AlienAttackBlob
...
Fixes alien humanoids not being able to attack blobs.
2015-03-31 19:11:12 +11:00
ACCount12
f10d0df8cf
Merge remote-tracking branch 'origin/master' into mining
2015-03-31 18:31:12 +12:00
ACCount12
1c219f0ebe
A lot of stuff
2015-03-31 18:30:09 +12:00
Cheridan
6abe8e4f3a
Merge pull request #8620 from phil235/RuntimeMutationFix
...
Runtime mutation fix
2015-03-31 00:11:00 -05:00
Cheridan
67d9f77ea9
Merge pull request #8600 from phil235/AlienNestFixing
...
Fixes alien nest buckling
2015-03-31 00:06:14 -05:00
Incoming5643
b2fdb13a62
removing old debugs and qdeling the dels
2015-03-30 22:53:02 -04:00
xxalpha
ccb4405de4
Fixes atmos hardsuit pathing.
2015-03-31 03:50:11 +01:00
Cheridan
9606763e5f
Merge pull request #8583 from Fayrik/CentcomExpansion
...
Centcom Two: It's better now, I swear.
2015-03-30 21:35:19 -05:00
Cheridan
3865495994
Fixes collar stuff
2015-03-30 18:22:25 -05:00
phil235
e88e8a4ed5
Fixes drowsyness never going down.
2015-03-31 00:27:32 +02:00
Incoming
d8d8a05a4a
Fixes a bug in mulligan antag where it would pick extended too much because it was seeing what modes it could run with new_players and not the crew.
...
Outright stops extended mulligans for the time because because it keeps interfering with my debugging and also no one seems to want it.
2015-03-30 17:39:42 -04:00
Incoming
58687cbbd3
Forgot to actually set the path, WHOOPS
2015-03-30 16:28:08 -04:00
Incoming
0b0ea5d9c2
traitors can now buy bloodred hardsuits for 8 TC (normal suits remain 5 TC)
2015-03-30 16:11:53 -04:00
Sawu
9a62c8b68a
Fixed duplicate variable
2015-03-31 05:24:24 +11:00
Xhuis
8c796a0756
Phazon construction nerf
2015-03-30 13:38:31 -04:00
