phil235
ddb5ffe324
Merge pull request #8582 from Xhuis/two_devices
...
Adds pizza bomb
2015-04-09 12:58:57 +02:00
phil235
b4616ad09b
Merge pull request #8731 from optimumtact/patch-2
...
stun batons no longer lose charge over time
2015-04-09 12:51:40 +02:00
Cheridan
e170ee88ce
Merge pull request #8804 from AnturK/signsdelay
...
Adds delay to picket sign waving
2015-04-09 00:26:08 -05:00
Cheridan
58a362b2f1
Merge pull request #8822 from sawu-tg/blackface
...
Fixes Spraycans not coloring faces correctly (and changes up lipstick)
2015-04-09 00:20:23 -05:00
phil235
939b5552ad
Merge pull request #8534 from Jordie0608/allgoodideasstartwithamistake
...
Fixes #8529 , confirmation check for BoH bombing
2015-04-08 20:01:35 +02:00
AnturK
0685e87341
- Adds delay to picket signs
2015-04-08 16:21:19 +02:00
Cheridan
c5f6f5ff2c
Merge pull request #8812 from Jalleo/Removal
...
Removal of empty file
2015-04-08 08:44:43 -05:00
Cheridan
f537b43108
Merge pull request #8789 from phil235/BeartrapFix
...
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
Jordie0608
ad33641101
Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
icons/obj/closet.dmi
2015-04-08 22:51:45 +10:00
Jordie0608
ffbef1f7d9
inversed check fix
2015-04-08 16:22:51 +10:00
Jordie0608
60cf76c881
fixes
2015-04-08 16:11:56 +10:00
Jordie0608
37277f66e7
pre-map compile
2015-04-08 15:40:41 +10:00
Sawu
6103b2a5e1
Fixes Spraycans not coloring faces correctly
...
* Changes Spraycans and lipstick to use a fully tintable overlay.
* Lipstick now comes in more colors and (codewise) can be changed with one var.
* Spraycans now color the face overlay correctly, racism for everyone!
2015-04-08 15:02:32 +10:00
Iamgoofball
c06ad7e6b8
moved process() to datum. made /datum/reagents/ process instead of the containers.
2015-04-07 17:13:59 -07:00
Xhuis
2cb387af90
Adds proximity/stat/etc. check and removes bloat
2015-04-07 19:52:14 -04:00
Iamgoofball
54154bec12
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-04-07 16:21:07 -07:00
phil235
6b83575b28
Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix
...
Conflicts:
code/modules/mob/living/living.dm
2015-04-07 20:27:37 +02:00
phil235
34a2b3be5b
Flying animals no longer triggers mines and mousetraps.
...
Space carps are flying animals now.
Adding changelog
2015-04-07 20:20:29 +02:00
blah
af99eea983
okay
2015-04-07 18:57:30 +01:00
hornygranny
e957233907
Merge pull request #8772 from MrPerson/foam_fixarooney
...
Fixes cleaner grenades
2015-04-06 16:09:35 -07:00
phil235
1f6a6b0e8c
Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
code/game/objects/structures/stool_bed_chair_nest/bed.dm
2015-04-06 19:38:51 +02:00
phil235
8499413649
Makes living/verb/resist more object oriented.
...
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02:00
Cheridan
062d0c2086
Merge pull request #8759 from optimumtact/patch-3
...
Fix can_speak check in megaphone
2015-04-06 08:48:49 -05:00
Cheridan
1da595b535
Merge pull request #8737 from RemieRichards/NinjaCleanup2
...
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
2015-04-05 21:54:33 -05:00
MrPerson
94c0c1598d
Fixes cleaner grenades
...
Fixes #8757
Default for locate is "in world"!
2015-04-05 16:55:17 -07:00
Xhuis
27625530e3
Kenny Loggins
2015-04-05 19:13:23 -04:00
Orange Borg
a5306ba1e0
Fix can_speak check in megaphone
...
The original check actually made no sense, but worked because it returned false every time as there was never a message passed through
2015-04-05 20:29:07 +12:00
phil235
6550016ee6
Merge pull request #8723 from kingofkosmos/grammarfixes
...
Recieve --> Receive
2015-04-04 20:00:21 +02:00
Remie Richards
5e93f57873
Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so.
2015-04-04 18:17:37 +01:00
Jordie
6d4f3b60f8
Merge pull request #8663 from dannno/sadclown
...
sad trombone for clown pda
2015-04-04 20:58:21 +11:00
Jordie
6d34032385
Merge pull request #8628 from Fayrik/AllTheSmallThings
...
Someone called for pest control?
2015-04-04 20:58:07 +11:00
Jordie
8d2f92cdd3
Merge pull request #8683 from AnturK/pickets
...
Adds Picket Signs
2015-04-04 20:57:56 +11:00
Jordie
3bb6cc8af9
Merge pull request #8625 from xxalpha/cyberplus
...
Cyber Implants +
2015-04-04 20:57:48 +11:00
Jordie
20ed6aada5
Merge pull request #8668 from ACCount12/syndieboxes
...
Toolboxes & welders update
2015-04-04 20:57:15 +11:00
Orange Borg
09c102cf9a
Update stunbaton.dm
2015-04-04 16:09:15 +13:00
Orange Borg
de16628204
stun batons no longer lose charge over time
2015-04-04 16:06:59 +13:00
xxalpha
7ec043a542
Added medical hud implant to CMO locker. Added chest implant sprites.
2015-04-04 00:56:06 +01:00
Remie Richards
862657bd7c
Merge pull request #8421 from dannno/guncases
...
gun lockers
2015-04-03 18:40:40 +01:00
danno "big fucking moron" gonzales
1f94f2fe27
Update guncase.dm
...
change 4 to capacity
2015-04-03 13:19:45 -04:00
danno "big fucking moron" gonzales
8de848eccb
Update guncase.dm
2015-04-03 13:16:25 -04:00
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
danno "big fucking moron" gonzales
cd3f2516e0
Update PDA.dm
...
i fucked up
2015-04-02 16:42:14 -04:00
dannno
fcd5938545
Merge branch 'master' of https://github.com/tgstation/-tg-station into sadclown
2015-04-02 16:30:08 -04:00
Xhuis
4377cd6536
Merge branch 'master' into stealthy_weapons
2015-04-02 16:10:37 -04:00
Artur
3ff5980e85
- Adds Picket Signs
2015-04-02 18:23:17 +02:00
dannno
6cba1d829c
a buhhhhhh buhhhhhhhhhh
2015-04-02 10:21:06 -04: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
57e1274353
Merge pull request #8624 from Cheridan/day42_betsoff
...
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
ACCount12
cda61c1075
Welder&toolboxes update
2015-04-01 10:43:22 +12:00
dannno
a2dfdc8f7b
sad trombone for clown pda
2015-03-31 14:13:48 -04:00
