Commit Graph

1595 Commits

Author SHA1 Message Date
Menshin a2a154aca9 Fixes for (#3441). 2014-04-19 14:02:37 +02:00
Ergovisavi f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
Cheridan 440039f0a2 Merge pull request #3429 from Giacom/fix_manuals
Fixes manuals being unreadable.
2014-04-16 14:31:52 -05:00
Cheridan a8c5e2ea24 Merge pull request #3389 from Ikarrus/notifyfix
Fixed AI not being notified of new roboticist-built cyborgs slaved to it
2014-04-15 14:15:43 -05:00
Giacomand 3a6672b639 Fixes manuals being unreadable. 2014-04-15 18:37:48 +01:00
Jordie0608 b18cc7d54e Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi
2014-04-11 02:51:07 +10:00
ikarrus 13fa889b7f Fixed AI not being notified of new roboticist-built cyborgs slaved to it 2014-04-09 20:55:36 -06:00
Cheridan 31cfe0ba80 Merge pull request #3378 from Donkie/jobrefactor
Jobcode refactoring TAKE TWO
2014-04-09 13:52:37 -05:00
Daniel 30bb6c8814 Generalised ID naming 2014-04-09 18:49:59 +02:00
Daniel 6c668c7c7b Generalised PDA naming 2014-04-09 18:43:29 +02:00
Razharas f44e3ffbf1 Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14
More qdel() changes
2014-04-08 15:37:44 -07:00
Miauw 5abb553f4a Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/_onclick/telekinesis.dm
2014-04-08 14:29:58 +02:00
MrPerson dd8891ef35 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_tweaks_3-31-14
Conflicts:
	code/game/machinery/camera/camera.dm
2014-04-08 04:53:05 -07:00
Razharas 03b34893d5 Merge pull request #3343 from Giacom/small_fixes
Fixes being able to change your chameleon jumpsuit's colour while dead.
2014-04-07 18:48:05 -07:00
Razharas ac72bcaa37 Merge pull request #3283 from Aranclanos/Blueprints
Fixes blueprints not being able to generate a second area.
2014-04-07 18:36:36 -07:00
iamgoofball 810b91e7ac removes a ton of things checking the ticker to see if it's monkey, a gamemode that no longer exists. 2014-04-06 11:46:12 -07:00
fleure 9db94d7c98 Merge pull request #3314 from Steelpoint/WaterTank
Increase's jani water tank's starting space cleaner supply
2014-04-06 17:16:06 +01:00
Giacomand ce8baeabb9 Fixes being able to change your chameleon jumpsuit's colour while dead.
Fixed an oversight with the red syndicate suits in the random uplink kit.
2014-04-06 15:16:22 +01:00
Miauw62 447bf56908 Merge pull request #3313 from Aranclanos/FalseWalls
Works with falsewalls and plasma asay logs.
2014-04-05 20:20:51 +02:00
Rockdtben f6906addb2 Merge pull request #3285 from Steelpoint/JaniBelt
Adds the janibelt!
2014-04-04 08:10:21 -05:00
Steelpoint 3fe2530086 Fix 2014-04-04 21:06:30 +08:00
Steelpoint 0f3acabbaa AmountChange 2014-04-04 20:40:12 +08:00
Aranclanos 7c93c1229f Removed a spawn() from the Destroy() proc of falsewalls.
Removed the falserwall type, now reinforced walls are a subtype of falsewalls.
Due to that, removed a bunch of copypasted code.
Falsewalls now spawn closed.
Falsewalls open/close timers are now proper, regarding their animation times.
You can't use a screwdriver on falsewalls while they aren't on a floor. (excluding shuttle floors)
Fixes issue #2338
Plasma falsewalls will now ignite.
Added a feedback message when you don't have enough sheets to create a falsewall.
Admin logs for igniting plasma walls, falsewalls, doors and airlocks.
Stadarized mineral_doors.dm.
2014-04-04 09:18:39 -03:00
Miauw62 47c463d0b2 Merge pull request #3276 from MrPerson/play_me_a_song_piano_man
Make violin stop cutting off other sounds
2014-04-03 20:26:58 +02:00
Steelpoint 1f4ff7204c More ALterations 2014-04-03 21:13:03 +08:00
Steelpoint 23a7847705 Alterations 2014-04-03 21:12:09 +08:00
ikarrus f46cb302a4 Updated to work with newer cyborg code. 2014-04-02 22:12:36 -06:00
ikarrus f705141fce Resolved Conflicts:
code/datums/wires/robot.dm
2014-04-02 20:23:31 -06:00
Steelpoint 58cbe6ff98 One more alteration 2014-04-03 01:42:25 +08:00
Steelpoint 52a8aa3bfa Whoops! 2014-04-03 01:33:22 +08:00
Steelpoint f45391a838 JaniBelt implementation 2014-04-03 01:30:02 +08:00
Firecage 8e67b38e40 Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-02 19:15:56 +02:00
Aranclanos 3afde2e394 Fixes blueprints not being able to generate a second area.
Thanks to dosfox for the fix mentioned on the issue report.
Fisex issue #2327
2014-04-02 13:34:02 -03:00
Giacomand e8d7526a0c Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite 2014-04-02 17:11:52 +01:00
fleure 400971d32b Merge pull request #3250 from MrStonedOne/powersink-admin-spam-fix
Fix for #3249 (Powersink is about to explode spam)
2014-04-02 15:53:43 +01:00
MrPerson 19d00b96f0 Make violin stop cutting off other sounds 2014-04-02 05:23:00 -07:00
Razharas 74b00b88c9 Merge pull request #3243 from GunHog/BLUE_AI_PRIV
Adds a name and light blue color to AI Private channel on the radio.
2014-04-01 18:53:29 -07:00
Firecage dabe951f56 Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-01 12:09:26 +02:00
Jordie0608 79746e115f Wooden Walls 2014-04-01 18:03:02 +11:00
Aranclanos 6c1150dca3 Merge pull request #3143 from Malkevin/saccult
Sacrifice Cult
2014-04-01 02:18:39 -03:00
Firecage bf3ad41e6d Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-01 06:45:10 +02:00
Cheridan 5fce1835b2 Merge pull request #3144 from Ikarrus/borgdebug
Debugging Cyborgs during Construction
2014-03-31 18:48:50 -05:00
MrStonedOne 6553980059 Fixes admin message spam, should only warn the admins once.
Fix for #3143
2014-03-31 14:42:47 -07:00
Malkevin 0725ba44a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-31 22:17:24 +01:00
Firecage cd3773450b Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-03-31 20:56:34 +02:00
fleure cccb3dcf76 Merge pull request #3226 from Giacom/syndicate_fab
Syndicate Suit Fashion
2014-03-31 19:35:45 +01:00
Firecage 79797afb6a Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-03-31 18:53:02 +02:00
Razharas d1fbcf2457 Merge pull request #3227 from fleure/tankfix
Watertank nozzles no longer delete
2014-03-31 09:48:57 -07:00
Firecage af00fd14bf Mimepack
This is a simple backpack for the mime.
2014-03-31 17:49:40 +02:00
MrPerson 2991dd72c9 More qdel() changes.
Move all atom/Destroy() behavior to atom/movable/Destroy() so turf/areas that get qdel()'d just get del()'d like they're supposed to. Also do tag = null, which should make more things GC.
Make cameras GC correctly and some misc grammar fixes.
Make smoke grenades GC.
Tell camera bugs to del() because I'm not working on complex behavior for one item.
2014-03-31 01:11:37 -07:00