23651b54f0
Merge pull request #5093 from paprka/medipens
...
Replaces a lot of inaprovaline syringes with medipens
2014-10-08 22:15:52 +01:00
f5e54f1fa8
Merge pull request #5069 from phil235/WindoorDeconstruction
...
Adds windoor deconstruction & bug fixes
2014-10-08 10:27:45 +01:00
c28dd40190
Merge pull request #5085 from paprka/WYATTSHIELDS
...
Adds telescopic riot shields
2014-10-07 21:13:03 -07:00
b124e4ac41
Merge pull request #5119 from paprka/arcwelder
...
Welding tool sprite updates
2014-10-07 20:12:30 -07:00
e611301f0f
Merge pull request #5044 from Jordie0608/mapmergersoannoying
...
Fixes #4788 Resin walls on the abandoned mining station
2014-10-07 19:39:12 -07:00
9797435df7
Merge pull request #5109 from paprka/telebatonstorage
...
Telebaton storage tweak
2014-10-07 14:25:56 -07:00
f96b017149
Merge pull request #5097 from phil235/Msg1Fix
...
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
598ef16d29
Merge pull request #5107 from tkdrg/borg_cult
...
Fixes restarted borgs hearing cult chat
2014-10-07 08:06:47 -05:00
208b136996
Merge branch 'master' of https://github.com/tgstation/-tg-station into mapmergersoannoying
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-10-07 21:56:06 +11:00
1aff1d6c20
welding tool updates
2014-10-06 18:04:47 -07:00
66304667cf
Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
code/datums/uplink_item.dm
2014-10-06 19:27:14 -05:00
ea4e6f823c
Merge pull request #5051 from paprka/rollingjsuit
...
Ports and improves jumpsuit rolling (casual adjusting) and noir detective set
2014-10-06 20:45:28 +01:00
175d42061c
Merge pull request #5088 from paprka/syndiesheet
...
Syndicate mother base/ship changes
2014-10-06 20:44:02 +01:00
d6a8e0de09
code nitpicking (thanks remie)
2014-10-06 12:39:15 -07:00
5b8b883cf0
Merge pull request #5050 from Incoming5643/spiders,man
...
Updates spiders to have full player functionality
2014-10-06 14:24:39 +01:00
304a865ff7
Merge pull request #5089 from tkdrg/tubesarecool
...
Constructable transit tubes!
2014-10-06 14:22:22 +01:00
acf5bee200
Merge pull request #5092 from Cheridan/flashing
...
Flash Changes
2014-10-06 14:10:31 +01:00
7c95d3b79b
stupid compile errors
2014-10-06 00:45:22 -07:00
89795c95bf
telebaton storage
2014-10-05 23:10:55 -07:00
f5b5ead3ef
Merge pull request #4516 from MrPerson/examinate_the_doctor
...
Change examine() from an atom verb to a mob verb
2014-10-05 23:37:34 -05:00
df8dc6d119
Merge branch 'master' of https://github.com/tgstation/-tg-station into flashing
2014-10-05 19:24:49 -05:00
a7f62f6d7c
Fixes restarted borgs hearing cult chat
2014-10-05 20:21:21 -03:00
4ef2e494a1
Changes flip/rotation, better diagonal handling
2014-10-05 14:09:10 -03:00
dd7a3b7fbc
Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix
...
Conflicts:
code/modules/admin/admin_verbs.dm
2014-10-05 13:48:11 +02:00
0c9c9c8b0a
Reduces decon time to 35 and adds a missed init_dirs
2014-10-05 08:46:34 -03:00
e1c0351e16
Merge branch 'master' of https://github.com/tgstation/-tg-station into plasmadoorfix
...
Conflicts:
code/game/machinery/doors/airlock.dm
2014-10-05 13:24:14 +02:00
eb2e5c4f31
medipens to default boxes
2014-10-05 03:10:17 -07:00
1bb6603ff4
replaces a lot of inaprov syringes with medipens
2014-10-04 22:03:09 -07:00
91cd4b2476
Final tweaks, map update. replaces cyborg's flash with their own subtype with the special effect.
2014-10-04 22:01:51 -05:00
fb7aff426d
Merge pull request #5039 from paprka/hatstation13
...
Some job-specific hat rebalancing
2014-10-04 20:51:08 -05:00
d7937fcd1a
This comment was supposed to be deleted
2014-10-04 21:58:12 -03:00
cd1cefdd7b
Flash Update
...
MASSIVE CLEANUP of flash code.
Instead of Weaken(), flashes now add confusion, similar to being drunk.
Synth flashes removed.
2014-10-04 19:51:14 -05:00
2257c8f985
new syndicate map changes
2014-10-04 17:40:28 -07:00
08be1b34eb
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
d0ce2a848d
First iteration of constructable transit tubes
2014-10-04 21:18:41 -03:00
537280b4b9
Removing many instances of the no longer used second argument of message_admins() proc.
...
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
2014-10-05 01:29:30 +02:00
6d4fb1483a
adds telescopic riot shields
2014-10-04 15:58:27 -07:00
041adce025
Merge pull request #5036 from paprka/telemelee
...
Telebatons for heads of staff
2014-10-04 17:09:20 -05:00
7a2d6be197
Merge pull request #5049 from nivomi/master
...
Added examine descriptions to various objects
2014-10-04 14:37:53 -05:00
3b150a0249
Merge pull request #5012 from phil235/APCFix
...
APC/airlocks/alarms fixes
2014-10-04 11:42:45 -05:00
651c3e6db5
Merge to master - sole conflicting file was ninja.dm FUCK NINJAS
2014-10-04 01:45:39 -07:00
a1475c7bf1
Correcting a naming problem.
2014-10-03 17:35:21 +02:00
00f0ef8c9d
Merge branch 'master' of https://github.com/tgstation/-tg-station into telemelee
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-10-01 21:06:23 -07:00
372ecd6233
Merge branch 'master' of https://github.com/tgstation/-tg-station into syndicateshotgunsreturn
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-10-01 20:10:58 -07:00
255254cb69
Merge pull request #5038 from paprka/atmosbelt
...
Utility/medical belts can now hold pocket extinguishers
2014-10-01 21:24:58 -05:00
a8056c6ba7
Merge pull request #4995 from Cheridan/hidey
...
Smuggler Satchels
2014-10-01 22:49:41 -03:00
0b605e7bdf
more NT ports
2014-10-01 18:36:57 -07:00
8e99152226
Updates spiders to have full player functionality
...
*All spiders can now web turf (but AI controlled non-nurses won't choose to), only nurse spiders can wrap items and lay eggs.
*Eggs laid by a player controlled nurse spider will eventually grow into player controlled spiders, while AI lain eggs will only result in AI spiders
*Adds non nurse spiders to the staff of change as they pass my rules for inclusion (Leaves a corpse, can do everything as a player the NPC can do, can't dominate a round by reproduction)
I take no responsibility for spidercode, it's a bit iffy but as far as I can tell it all works for players now.
2014-10-01 18:58:07 -04:00
eae5d0b7af
Smuggler pack can now fit in backpacks itself
...
Fixes some sprite issues
2014-10-01 17:33:08 -05:00
822613d698
remove helmet pathing
2014-10-01 15:01:36 -07:00
Remie Richards
hornygranny
MrPerson
Cheridan
Jordie0608
paprka
tkdrg
phil235
paprka
Aranclanos
Incoming