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
phil235
f9f618d699
Adding the chemical reactions and recipes for the new recipes.
...
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +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
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
phil235
493c3e038a
Splitting food.dmi into smaller files.
...
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02: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
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
Swag McYolosteinen
d8c588867a
Merge pull request #8634 from sawu-tg/master
...
See #7217
2015-03-31 19:40:33 +02:00
MrPerson
d6be5a2e1b
Move time for lighting changes from a scale to a fixed length
...
PDA's start off again, but the code is still there.
forceMove() now calls Moved() and has some other minor tidying up. This means teleporting will update the lights around you right away.
2015-03-31 05:09:46 -07:00
MrPerson
e4a3abdd70
Object based lighting system
...
Uses actual objects on each non-space, dynamically lit turf. Light levels are switched back and forth via animate() and the object's alpha. Supporting colors shouldn't be too hard. Some hacky efficiency improvements means it isn't that much more expensive than current (I think, needs testing). Most of the lighting ss's cost is in checking all the lights and doing big loops, not anything actually in the loops themselves.
Start PDA flashlights on. This was to speed up testing but frankly I think it's a good change in general.
Added a Moved() proc. Called after a successful move.
In the future I hope to move off the luminosity var entirely but that was too slow in testing for me. That's what all that "for(area in sortedAreas) area.luminosity = 1" stuff in the lighting ss is, tests on removing luminosity outright.
2015-03-31 05:09:42 -07: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
9606763e5f
Merge pull request #8583 from Fayrik/CentcomExpansion
...
Centcom Two: It's better now, I swear.
2015-03-30 21:35:19 -05:00
phil235
0cef9e5539
Merge pull request #8198 from Xhuis/cigar_cases
...
Adds cigar cases
2015-03-30 18:47:46 +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
Fayrik
9b834fca7a
Look at all these bugs that no longer exist!
2015-03-30 03:36:24 +01: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
Jordie
8113c2a1f0
Merge pull request #8483 from xxalpha/c4fix
...
Fixes the C4 being planted on the DA.
2015-03-30 01:21:52 +11:00
Jordie
c8e0c16d09
Merge pull request #8520 from MrPerson/effect_cleanup
...
Effect pooling
2015-03-30 01:21:40 +11:00
Fayrik
7336e6ecb8
Call Centcom! ERTs got fixed!
2015-03-29 03:54:54 +01:00
Fayrik
4f43fff199
Issue fixes! All that, and more!
2015-03-29 03:54:41 +01:00
Xhuis
d209ce5235
Merge remote-tracking branch 'remotes/upstream/master' into stealthy_weapons
2015-03-28 14:42:31 -04:00
Xhuis
2c988e0aea
Adds pizza bomb traitor item
2015-03-28 12:45:05 -04:00
xxalpha
55b81363cc
Merge remote-tracking branch 'upstream/master' into hardjet
...
Conflicts:
code/modules/clothing/spacesuits/hardsuit.dm
2015-03-27 19:35:10 +00:00
Cheridan
cb23548768
Merge pull request #8533 from Jordie0608/greatpermitsbringgreatweightresponsibility
...
Fixes #8527 , construction permit weight
2015-03-27 14:04:38 -05:00
Cheridan
17067d9021
Merge pull request #8508 from phil235/SlimeAnimal
...
Life refactor and slime as animal
2015-03-27 13:38:16 -05:00
Jordie0608
1fc89cb611
removes soh singulo interaction
2015-03-26 13:19:56 +11:00
Jordie
a86b757d93
Merge pull request #8291 from Xhuis/nerf_thermal_vision
...
Nerfs changeling augmented eyesight
2015-03-26 13:01:25 +11:00
phil235
1b3eb49a1d
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
hornygranny
e92fe6c333
Merge pull request #8495 from dannno/hahaobjectionxd
...
adds hammer and gavel
2015-03-25 16:13:39 -07:00
Jordie0608
a6a9aa8a89
adds some sanity checks
2015-03-25 18:03:48 +11:00
Jordie0608
a5396f320a
confirmation check for boh bombing + soh also makes singulo
2015-03-25 17:29:43 +11:00
Jordie0608
461ea87bdc
construction permit's w_class to 1
2015-03-25 16:52:09 +11:00
Jordie
0e57fc6941
Merge pull request #8488 from Miauw62/whatsthedifferenceanyway
...
Adds a verb_exclaim var. Fixes #8478 .
2015-03-25 16:31:16 +11:00
Jordie
ff90e1599c
Merge pull request #8320 from AnturK/headcrabs
...
Adds Headcrabs!
2015-03-25 16:31:00 +11:00
Jordie
9a217503aa
Merge pull request #8451 from Fayrik/FoamForceFuckYeah
...
Foam force fuck yeah!
2015-03-25 16:30:42 +11:00
Jordie
fde0eecce8
Merge pull request #8456 from MrPerson/im_the_music_meisteeeeeeeeeeeeeer
...
Instrument tweaks
2015-03-25 16:29:29 +11:00