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
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
053046c970
typo fix
2015-04-01 06:28:23 -05: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
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
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
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
67d9f77ea9
Merge pull request #8600 from phil235/AlienNestFixing
...
Fixes alien nest buckling
2015-03-31 00:06:14 -05: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
Sawu
bfd0436324
See #7217
...
* Spraycans are given to Revheads
* Spraycans act as instant use crayons.
* Spraycans can be used on walls.
* Spraycans can be used as ghetto pepper spray, but leave the target with a coloured face (can be removed with space-cleaner)
(Old pictures, there is now only one can that changes color)
2015-03-31 02:26:05 +11:00
Cheridan
caecd36d7c
Merge pull request #8552 from Jordie0608/togetwiththetimesyouwillfirsthaveotfindthem
...
Removes old player panel
2015-03-30 09:57:39 -05:00
Cheridan
724759a01f
Merge pull request #8611 from phil235/BotanyFix1
...
Two botany fixes
2015-03-30 09:51:24 -05:00
Cheridan
74d2d67280
Merge pull request #8604 from Niknakflak/NakedCorgis
...
Adds the ability to shave all types of corgis
2015-03-30 08:26:01 -05:00
Cheridan
884e9e3774
Day Who-Knows: Bar Gambling Expansion!
...
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
NikNakFlak
010fed04c6
Spelling
2015-03-29 15:30:58 -07:00
NikNakFlak
306adf7d95
Corgi fixes.
2015-03-29 13:21:56 -07:00
Cheridan
bf36e8d040
Merge pull request #8615 from sawu-tg/npcpool
...
Updates the NPCPool to current branch.
2015-03-29 15:10:15 -05:00
NikNakFlak
a4c870669d
Code changes to corgi.dm and changelog
2015-03-29 12:44:42 -07:00
Xhuis
932cac081a
Separates ship ambience and area ambience
2015-03-29 14:49:59 -04:00
Swag McYolosteinen
8d87453501
Merge pull request #8542 from GunHog/ntsl_exSPANsion
...
NTSL Expansion!
2015-03-29 19:41:00 +02:00
Sawu
ab776cf014
Updates the NPCPool to current branch.
...
see #7012
* NPCPool will co-ordinate and organize all SNPCs, making them stronger and more intelligent.
* SNPCs can use the botPool system to co-ordinate and delegate with each other.
* SNPCs have been given factions to allow interoperability between certain types of SNPCs.
* Bots (machinery/bot) can use the system too for basic help and coordination.
2015-03-30 02:50:21 +11:00
xxalpha
66c47c98e1
Added check for inbuilt jetpack in movement_delay proc.
2015-03-29 16:15:13 +01:00
xxalpha
937aea030f
Merge remote-tracking branch 'upstream/master' into fasterspace
...
Conflicts:
code/modules/mob/living/carbon/human/species.dm
2015-03-29 15:30:38 +01:00
Jordie
d78ca0c57a
Merge pull request #8566 from Incoming5643/literal_fun_removal
...
Magic Mania NaN: The Fun Ends Here
2015-03-30 01:25:52 +11:00
Jordie
fdbef46277
Merge pull request #8543 from Szunti/mining-mobs-night-vision
...
Night vision for mining mobs
2015-03-30 01:22:53 +11:00
Jordie
c8e0c16d09
Merge pull request #8520 from MrPerson/effect_cleanup
...
Effect pooling
2015-03-30 01:21:40 +11:00
Jordie
f5cf0dd3e9
Merge pull request #8392 from xxalpha/hardjet
...
Embedded Jetpacks
2015-03-30 01:21:05 +11:00
Jordie
98873da060
Merge pull request #8549 from tedward1337/Ohgodthisishard
...
Adds Bluespace artillery button.
2015-03-30 01:20:45 +11:00
Remie Richards
2dec0e8fa4
Fixes Hat removal code by reticking carbon/inventory and moving carbon inventory code back there. (Mystery coder who undid this, Curse you!)
2015-03-29 14:45:09 +01:00
phil235
e2eda9cda8
Fixes growing rice stalk being invisible at later stages.
...
Fixes empty trays not receiving the nutrient/reagents/water you give it.
2015-03-29 15:15:49 +02:00
