b8f0ef4efe
Merge pull request #5541 from xxalpha/cigarettes
...
New Cigarette Packs
2014-11-03 18:49:29 -08:00
05539c7d13
Merge pull request #5382 from TZK13/Asteroid-Toy
...
Adds new meteor toys and space carp plushies to arcade machines
2014-11-03 18:39:16 -08:00
e662932bd1
Merge pull request #5512 from RemieRichards/AcidBurns
...
Acid Rework
2014-11-03 18:11:49 -08:00
1b6eb8afec
Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-11-03 17:57:40 -08:00
de22ca7aac
Merge pull request #5354 from optimumtact/patch-1
...
Remove click delay from pipe painter and adds adjacency check
2014-11-03 17:44:29 -08:00
d81eb696c4
Merge pull request #5570 from xxalpha/noslipfloor
...
High-traction Floor
2014-11-03 17:37:20 -08:00
bf9679d6cb
Merge pull request #5581 from tkdrg/spacefactory13
...
Constructable conveyor belts!
2014-11-03 17:33:32 -08:00
8b4ab665cb
Merge pull request #5490 from tkdrg/hiasl
...
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
7e4688e3f6
Merge pull request #5427 from paprka/littlejanitorthings
...
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
6e11157661
Merge pull request #5520 from paprka/minerscrubs
...
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
0a0cd991de
Merge pull request #5516 from paprka/telestunfix
...
fixes telebaton stunning borgs
2014-11-03 17:11:39 -08:00
c1060d95b2
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns
...
Conflicts:
code/game/atoms.dm
code/game/objects/items.dm
2014-11-03 19:38:58 +00:00
51eae4c5a2
Merge pull request #5601 from phil235/ObjVerbCheckFix
...
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
71fe1bf00b
Merge pull request #5597 from phil235/IdMsgFix
...
Fix the 'show ID' message.
2014-11-02 11:10:16 -06:00
4f58312d76
Merge pull request #5596 from phil235/LipstickFix
...
Fix for #5588
2014-11-02 10:39:21 -06:00
ef29aaef57
Merge pull request #5598 from phil235/PDAsoundFix
...
Fix lack of sound when non-silent PDA receives a message.
2014-11-02 10:26:28 -06:00
30841b5f37
Merge remote-tracking branch 'upstream/master' into hiasl
...
Conflicts:
code/modules/research/message_server.dm
2014-11-01 20:04:26 -03:00
97a89b1162
Stun proc punctuation and compile error fix
2014-11-01 11:32:50 -07:00
17ea3d8641
adds stun to emagged defib
2014-11-01 11:28:51 -07:00
52d99e64ca
noclone check
2014-11-01 11:23:51 -07:00
6acd73c835
changes emagging, punctuation, and emag stun
2014-11-01 11:20:05 -07:00
128c9222e5
Adding checks for stun, restrained to many object verbs.
...
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
4803f099f6
Fix lack of sound when non-silent PDA receive message.
2014-11-01 15:32:48 +01:00
c8f3ad2dd0
Fix ID show message.
...
Remove "Read ID card" object verb (because all the information it gave was already in the ID card's name.
Remove some old text( ) stuff.
2014-11-01 15:17:43 +01:00
af767f2935
Fix being able to apply lipstick through masks and items covering the mouth.
2014-11-01 13:28:32 +01:00
0bc683aa29
Merge pull request #5457 from GunHog/AI_Radio
...
Adds AI Integrated Radio
2014-11-01 03:44:44 +00:00
df289b5c53
Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-10-31 10:28:57 -07:00
389e0e1237
research design and origintech update
2014-10-30 19:21:58 -07:00
b9f5947f5e
High-traction Floor
2014-10-31 01:50:31 +00:00
0296e7634a
lots of debugging, ghost notifications work now
2014-10-30 17:32:19 -07:00
0bb462e857
Fixes botcall conflicts, removes even more cruft and unused code
2014-10-30 20:36:30 -03:00
9526b8804b
Merge remote-tracking branch 'upstream/master' into attackoftheturfs
2014-10-30 19:35:03 -03:00
920739c8ab
defibrillators initial commit
2014-10-30 14:53:51 -07:00
7db4f1f9a2
Fixes chat channel bugs, removes PDA authentication because apparently our players are too dumb to not share passwords between ss13 and banking accounts
2014-10-29 23:00:23 -03:00
1ae24af71e
Added reagents to some cigarette packs
2014-10-30 01:03:51 +00:00
7803f296ba
New Cigarette Packs
2014-10-30 00:08:14 +00:00
cc96d09843
Adds NTRC help screen, fixes PDA /join bug that let you join multiple times without updating chat_channel
2014-10-29 20:50:08 -03:00
571a0953b4
Fixes chatroom runtime (thanks Gun Hog!), auto-adds # if the channel does not contain it already, obsoletes /new (its functionality is now included in /join)
2014-10-29 20:17:16 -03:00
ab6ca61e2a
Lets AIs and pAIs use the chatroom function in their built-in PDAs.
2014-10-29 19:32:23 -03:00
a216b7024e
Merge remote-tracking branch 'remotes/upstream/master' into AI_Radio
...
Conflicts:
code/modules/mob/living/silicon/ai/ai.dm
2014-10-28 23:53:26 -05:00
90d9dddf39
Merge remote-tracking branch 'upstream/master' into hiasl
...
Conflicts:
code/modules/client/client procs.dm
2014-10-29 01:27:08 -03:00
3a862deb6b
Adds chatroom logging (both admin and IC).
2014-10-29 01:20:53 -03:00
1aef19c835
Merge pull request #4974 from GunHog/Botcall_TG_Edition
...
Botcall, TG edition!
2014-10-28 22:17:35 -05:00
1b91ab24ce
Improves mining equipment locker and rewards system, and buffs kinetic accelerator
2014-10-28 15:42:55 -07:00
07ff02b7c4
Merge pull request #5477 from MrPerson/space_movement_jam
...
Space movement rewrite to allow everything to drift
2014-10-28 22:15:05 +00:00
826d81555e
Delete changelog and remove unused on variable
2014-10-29 09:04:34 +13:00
635458446a
fixes compile errors by assigning proper target for checks
2014-10-28 09:51:36 -07:00
b0be021739
fixes telebaton stunning borgs
2014-10-28 09:03:46 -07:00
19ab2c4a2b
Logic fix + Tweaks
...
- Corrects the logic for when the AI can speak on its radio.
- Added a missing "-" to the radio instructions.
- Removed an unneeded feedback line for toggling the AI's radio via
intellicard.
2014-10-28 10:23:56 -05:00
e9f6e5d17d
Added a changelog entry
...
Also fixed the chair-diagonal drifting bug somehow
2014-10-28 07:37:31 -07:00
hornygranny
paprka
Remie Richards
Cheridan
tkdrg
phil235
xxalpha
GunHog
Francis Devine
MrPerson