4bdffc2dc3
Merge branch 'master' of https://github.com/tgstation/-tg-station into somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-01-22 17:01:20 +01:00
e8ed1a83f7
Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/job_closets.dm
2014-01-20 19:29:47 +00:00
13b3cd69f2
Adds changeling arm blades that can slice tables apart and break computers and generally be robust.
2014-01-19 18:33:03 +01:00
5222191b73
Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket.
...
Also makes ties show up on the jumpsuit object.
2014-01-19 14:50:27 +00:00
a3e94d74e9
Black Baseball Caps [FIXED]
2014-01-19 00:35:10 -08:00
03464e1f4d
Slime Mob Refactor
...
Death of the istype invasion from slimes, previously every single color of slime was its own kind of mob, and every single one of those slimes also had an adult form which was a different mob.
There is now only one kind of slime, reliant on new var is_adult and old var colour to determine how it looks. All baby slimes functioned identically outside of icon and core, and all adult slimes functioned identically to each other and to the babys save for a bit higher Health and more capacity to break shit.
A nice side effect is that this solves any inheritence issues of baby slimes growing up since it's still the same mob, though it doesn't solve the same issues for adult slimes splitting.
Also fixed a few annoying but rare bugs (like getting ghosted because you got DC'd and your slime self split and you weren't around to get mind transfered)
2014-01-13 19:38:37 -05:00
c8120da49c
Merge pull request #2283 from YotaXP/list2text-refactor
...
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
4304107d26
Merge pull request #2242 from ChuckTheSheep/Morgue-Changes
...
Morgue Changes
2014-01-10 08:19:33 -08:00
769e9dd9a7
Merge pull request #2137 from Rumia29/23/12/2013-rdaltuniform
...
Adds an alt RD uniform to the RDs locker
2014-01-10 00:52:09 -08:00
3d6eb6dd3d
Fixed tables not working
2014-01-09 18:54:54 -03:00
8e050332d6
Cleans up the for() and list handling in update.
2014-01-08 18:12:17 -05:00
f98a57b750
Optimized and refactored list2text, text2list, and replacetext.
...
Also fixed some grammar in the station blueprint code.
2014-01-07 22:15:25 -05:00
1d7858d54f
Fixes regarding path case
2014-01-06 18:01:28 -05:00
58159a00ad
Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables
...
Poker tables
2014-01-06 14:35:03 -08:00
e97ce3edfa
Moved on_login() now named on_log()
2014-01-05 20:49:36 -05:00
072b78876f
Merge branch 'Morgue-Changes' of https://github.com/ChuckTheSheep/-tg-station into Morgue-Changes
2014-01-05 20:36:10 -05:00
5cda0c140e
Forgot Crematorium Changes - Whoops
2014-01-05 20:35:57 -05:00
bf9fa21ddc
Merge pull request #2149 from Miauw62/kittens
...
Kittens!!!! !!! !! !! !!!!!! !
2014-01-04 20:21:15 -08:00
e71314d4eb
Merge pull request #2199 from Perakp/buckleFix
...
Buckle fix
2014-01-04 19:51:59 -08:00
d1eb240c33
Whoops
2014-01-04 21:22:31 -05:00
9bff642d14
Genocide of the Colons
2014-01-04 21:21:42 -05:00
f03d2be397
Morgue Changes
...
Crematorium lights up when cooking.
Morgue slabs change light color depending on what is inside.
Red = dead body, orange = no body but items, green = client connected
body.
Updates when open or closed, and when ghosts/re-enters body inside.
2014-01-04 19:50:13 -05:00
61ed6a5e15
Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2014-01-03 19:27:51 +01:00
3a11af405c
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
...
Conflicts:
code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
ac9228bae1
Added an else message to make it clear you can't unbuckle while buckled.
...
Refractored code to reduce copypasta.
2014-01-01 11:31:15 +02:00
4f6eba7f6a
A proper fix for unbuckling while buckled.
2013-12-31 10:25:12 +02:00
210a4c4d58
Now you can't unbuckle someone if you are buckled yourself.
...
This affects shuttlegriff and alien nesting the most.
2013-12-31 09:48:42 +02:00
bb9c09df46
Obsoletes flags = FPRINT | TABLEPASS*
...
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.
Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.
If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
e52a838284
Sprite Changes on request from Nienhaus
2013-12-29 20:46:37 -05:00
a348534ab1
Personnelly, I feel this pull request was successfull.
...
Spelling fixes.
2013-12-29 15:54:50 -08:00
f1376608eb
Added kittens and Proc, sprites by Nienhaus.
2013-12-27 15:44:40 +01:00
b9efeaa932
Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
...
Item name fixing round3
2013-12-26 23:14:15 -08:00
46222226e1
adds the uniform to the RDs locker, and updates the sprites.
2013-12-24 13:11:41 -05:00
0338a66c2a
Adds fingerprints to a bunch of stuff. De-texts computer build paths.
2013-12-22 18:57:33 +01:00
58d0ed5221
Merge pull request #2094 from RobRichards1997/19/12/2013-Sec-see-Sec-Sprites
...
Security Sprite updates.
2013-12-21 15:24:14 -08:00
e7579e2aa8
Merge pull request #1986 from Perakp/janitorCartFix
...
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
5fb0d05dd1
Merge pull request #2096 from Aranclanos/SweetLindaNobodyWillTouchYou
...
Small fixes for Linda.
2013-12-21 13:57:15 -08:00
9dd0432697
Implements Gia's Superior Idea.
...
fixes some directions on Nienhaus's sprites
2013-12-21 20:09:52 +00:00
b8d8975fe6
Fixes Kaze's Suggestion
...
Standardises the fuck out of Table attackby's (NO COPYPASTA ANYMORE YAY)
Adds a new proc which does the above.
2013-12-21 18:22:49 +00:00
c40af6ae40
Update icons after item is placed in cart.
2013-12-21 09:50:15 +02:00
65e0931d55
Merge branch 'master' into janitorCartFix
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
290d8801bd
Craft Poker tables with wooden tables and Astroturf(grass)
2013-12-21 00:34:56 +00:00
b7fe3a8e64
Seedy dealings in Seedy places, Adds the Poker_table (Sprites by Nienhaus)
2013-12-20 23:02:19 +00:00
213f3fff31
Some fixes for Linda, now the Move() proc of objects that block air is different. Example below.
...
object/Move()
var/turf/T = loc
..()
move_update_air(T)
2013-12-19 22:13:21 -03:00
f8c05e2169
Security Sprite updates.
...
Replaces all instances of the old Swat and riot sprites with Validsalad's new ones
Replaces Sechailer's with Officer, Warden and HoS versions code and Sprites wise (Sptires by Validsalad again)
The officer gas mask is gas/sechailer, the warden's is gas/sechailer/warden and the HoS's is gas/sechailer/hos
2013-12-19 23:14:51 +00:00
1ce0b11b0d
Fixes morgue trays used by ghosts and what not
2013-12-19 00:23:36 +04:00
68ff764463
Subtypes of janiborg tools
...
- The other way of fixing it. I’m not sure why this is better.
- Removed condescending messages to cyborgs.
2013-12-18 20:44:24 +02:00
86ad35374e
Merge pull request #2010 from JJRcop/transit-tube-interaction
...
Adds functionality to empty a transit pod or put mobs in one
2013-12-15 07:23:43 -08:00
a3a1aa952d
New way to prevent saxxing in transit tubes to run from the law
2013-12-14 18:23:15 -05:00
088b5afe93
Following code standards
...
- One statement per line.
2013-12-14 17:49:51 +02:00
Miauw
Pete Goodfellow
John Smith
Incoming
Giacom
Aranclanos
ChuckTheSheep
YotaXP
Cheridan
Perakp
Rumia29
Cluwnes Honk
Robson Richards
Razharas
JJRcop