2ed906b990
Fixes inhand sprites for eggs.
...
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
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
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
92b0f9f4cd
Adding a changelog.
...
Some work on death() procs of many animals.
Replacing most istype(XYZ, mob/living/simple_animal/slime) by isslime(XYZ).
Some work on slime feeding procs.
Made simple animal aliens see in the dark like regular aliens (in case somone wants to control one).
2015-03-26 02:23:39 +01:00
0e57fc6941
Merge pull request #8488 from Miauw62/whatsthedifferenceanyway
...
Adds a verb_exclaim var. Fixes #8478 .
2015-03-25 16:31:16 +11:00
9a217503aa
Merge pull request #8451 from Fayrik/FoamForceFuckYeah
...
Foam force fuck yeah!
2015-03-25 16:30:42 +11:00
ffd711c26f
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/living/simple_animal/slime/say.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
ba2a1c8f19
Adds a verb_exclaim var. Fixes #8478 .
...
Also makes saymods transmitted through the radio system for upcoming NTSL integration.
2015-03-22 18:55:59 +01:00
01c18eadca
Replaced prob(rand(A,B)) with prob((A+B)/2).
...
They are the same probability.
Rounded to integers where the values were literals.
2015-03-21 19:12:16 +01:00
d496fe241f
Merge pull request #8228 from Xhuis/orion_trail_emag
...
Adds an emag mode to the Orion Trail game
2015-03-21 17:23:44 +11:00
b758992e8c
First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo.
2015-03-20 23:02:53 +00:00
aecb365f84
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
03fcb9e139
Makes the machine less deadly to non-users
2015-03-20 07:23:59 -04:00
1873143e63
Initial say cleanup commit.
2015-03-18 19:23:31 +01:00
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
29609457f5
Makes the message when you're attacked slightly bigger for better visibility."
...
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
32d40b67a6
Adds emagged mode to the Orion Trail
2015-03-09 17:20:36 -04:00
9b1fa2479b
conflict fixing + changelog
2015-02-26 16:48:11 -05:00
23ecfeebf8
THE OWL RETURNS: PART 4: PRODUCT PLACEMENT
...
- adds The Owl and The Griffin prize toys to the arcade
- adds The Owl and The Griffin posters (legit and contraband respectively)
- adds The Nest barsign
2015-02-26 16:36:44 -05:00
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
2778eccc1b
Merge pull request #7873 from phil235/SecRecordConsoleFix
...
Fixes not being able to modify certain properties on security record console
2015-02-22 20:19:25 -08:00
3cd66f4f34
Merge pull request #7739 from paprka/computerlights
...
Computers emitting light
2015-02-22 12:05:34 +01:00
6aff3f3e3f
Fixes not being able to modify certain properties on security record console records.
2015-02-21 19:34:31 +01:00
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
1ade8feac8
broken computers and changelogs
2015-02-18 02:16:33 -08:00
bb6596430f
computers emit light
2015-02-14 16:37:17 -08:00
bae27bc40b
Allow station self destruct with captains identity card
2015-02-15 12:09:09 +13:00
f5359aba3b
Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo
...
Adds photos and some other stuff to security and medical records
2015-02-05 18:45:53 +01:00
50cc057504
Lots of fixes and improvements
2015-02-04 17:35:42 +04:00
2edcbc5a08
Merge pull request #7526 from TheVekter/redbutton
...
Adds red button toy to arcade machines
2015-02-04 12:17:24 +03:00
9bf58de009
Added red button
2015-02-03 08:25:50 -06:00
4761563571
removes carp and blood checks from holodeck
2015-01-31 23:18:21 -08:00
a661e58281
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-31 22:03:00 -08:00
30d62a89a8
Merge pull request #7396 from Menshin/supply_comp_contraband_fix
...
Fixes supply computers not been able to order contraband
2015-01-29 18:42:37 +01:00
697c79e99c
Merge pull request #7387 from Delimusca/foamfun
...
foam armblade toy
2015-01-29 18:28:58 +01:00
6b358c93ef
The supply computer now correctly inherit the contraband variable from its board ( fixes #7391 )
2015-01-28 00:39:49 +01:00
a00714f140
added foam armblade
2015-01-26 18:06:42 -07:00
c33992fed0
Code cleanup
2015-01-25 00:04:50 +04:00
47e0a4fa02
WhiteShip2
2015-01-24 20:27:06 +08:00
bfd74684b4
Tweaks as noted, added myself to admins.txt
2015-01-24 16:14:44 +04:00
f071655ea4
updates and optimizations
2015-01-24 01:12:57 -08:00
3619ed4c0d
Merge branch 'master' into Sec_record_photo
...
Conflicts:
code/modules/mob/living/silicon/silicon.dm
2015-01-21 21:26:46 +04:00
a22d1ecfe2
Adds photos and species to security and medical records, plus some other tweaking
2015-01-21 21:21:47 +04:00
5b406907ce
Merge pull request #7018 from Firecage/Crew_manifest_jobs
...
This adds some jobs properly to the crew monitoring console.
2015-01-15 19:17:08 +01:00
2082baa64b
Merge pull request #7042 from phil235/AudibleMessageRuntimeFix
...
Fixes some runtimes from audible_message proc.
2015-01-15 19:14:31 +01:00
d3975845b9
Merge pull request #6688 from phil235/LibraryComputer
...
Library console are now real buildable computers
2015-01-15 00:46:24 -03:00
674b3b65c0
Merge pull request #6968 from phil235/LockdownMalfFix
...
Fixes malf AI lockdown affecting doors on away missions
2015-01-14 14:58:10 -03:00
884e2a6f73
Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message.
2015-01-14 18:00:17 +01:00
7fc0bca4f8
Fix a typo and replace 7 with ZLEVEL_SPACEMAX. Making a ZLEVEL_ABANDONNEDTSAT define.
2015-01-14 14:24:18 +01:00
f93ee8b99b
Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path.
2015-01-14 14:04:21 +01:00
phil235
kingofkosmos
Jordie
Miauw
Szunti
Fayrik
Xhuis
dannno
Remie Richards
hornygranny
paprka
oranges
Lo6a4evskiy
Razharas
TheVekter
Menshin
Delimusca
Steelpoint
tkdrg