Fox-McCloud
e88a4131bf
Merge pull request #1936 from KasparoVy/master
...
Vox Coloured Uniforms
2015-09-03 21:33:55 -04:00
TheDZD
f8f878765f
Merge pull request #1949 from tigercat2000/whopseat
...
Fix mobs being unable to eat other mobs
2015-09-03 18:23:44 -04:00
Tigercat2000
3b5534f26d
Fix mobs being unable to eat other mobs
2015-09-03 14:50:05 -07:00
KasparoVy
236dee303b
Unnecessary spaces
2015-09-03 17:31:27 -04:00
KasparoVy
0e10bd2cc3
Fixes Psychedelic Jumpsuit
...
It wasn't using the Vox sprite because I'd forgotten to give this one a specific species_fit and sprite_sheets as it isn't a child of obj/item/clothing/under/color/
2015-09-03 17:29:41 -04:00
TheDZD
19c4f9d4ef
Merge pull request #1929 from Fox-McCloud/edagger
...
Adds in E-Daggers
2015-09-03 16:56:01 -04:00
TheDZD
62add0a3e3
Merge pull request #1935 from Fox-McCloud/recycling
...
Disposals/Recycling Remap
2015-09-03 16:55:53 -04:00
Markolie
829441bd01
Fixes https://github.com/ParadiseSS13/Paradise/issues/1930
2015-09-03 22:20:26 +02:00
KasparoVy
34d7b280dc
Put Jerseys back
...
Because travis, and apparently it IS used for something despite my not
finding any sprites for it (even for HUMANS). I guess I'll have to look
harder
2015-09-03 14:57:32 -04:00
KasparoVy
038011441f
Missed a spot
2015-09-03 14:46:22 -04:00
KasparoVy
2937382b15
Moves Species_fit and Sprite_sheets to /obj/item/clothing/under/color, Removes Jerseys
...
Greatly reduces code as per Fox' suggestion. I outright snipped out the red and blue jerseys at the bottom because in the human icons/mob/uniform.dmi there aren't even sprites for it, and I've never ever heard of it being used. The blackf suit appears to use the same sprite as the black suit, so I figured that'd be alright too.
2015-09-03 14:45:41 -04:00
KasparoVy
255e0bd6a8
I'm dumb
2015-09-02 02:08:54 -04:00
KasparoVy
54376d4cff
Vox Coloured Uniforms
...
Adds a Vox sprite for every single coloured uniform in color.dm and
implements it.
Had this PR waiting 'cause the stupid way I do things only allows me to
do one at a time, haha.
Anyway, you're going to have to use your imagination for this one-- as
it would be an insane amount of work to photoshoop every single sprite
onto a Vox and make a rainbow out of the lot of them.
I really wish my Dream Daemon wasn't broken.
2015-09-02 01:44:20 -04:00
Mark van Alphen
6918f3073e
Merge pull request #1921 from KasparoVy/master
...
Chief Engineer Hardsuit Fix
2015-09-02 07:21:37 +02:00
Fox-McCloud
9f5ce7b1a1
Disposals/Recycling Remap
2015-09-02 01:01:08 -04:00
Mark van Alphen
27e5a51cae
Merge pull request #1932 from Fox-McCloud/derp-fox
...
Fixes Derp Fox
2015-09-02 06:42:20 +02:00
Spacemanspark
76bf14f009
Fixes *halt spam.
...
I'm sorry.
2015-09-01 22:15:04 -05:00
Fox-McCloud
5c9a6257f3
Fixes Derp Fox
2015-09-01 22:46:33 -04:00
Fox-McCloud
06ee1a618a
Merge pull request #1928 from Markolie/fax
...
Fix admin viewing paper bundles
2015-09-01 17:58:48 -04:00
Fox-McCloud
66edd1826e
Adds in E-Daggers
2015-09-01 17:56:01 -04:00
Markolie
4cde301243
Fix admin viewing paper bundles
2015-09-01 23:47:32 +02:00
Fox-McCloud
9695509908
Merge pull request #1919 from tigercat2000/funlittletgthings
...
Progress bars
2015-09-01 16:45:10 -04:00
Fox-McCloud
2fd18a2410
Merge pull request #1917 from Markolie/byondmembers
...
Add BYOND member perks
2015-09-01 16:42:34 -04:00
Fox-McCloud
2d0f77fa1b
Merge pull request #1916 from Markolie/looc
...
Reboot improvements, player panel fix, IsBanned fix
2015-09-01 16:42:09 -04:00
Fox-McCloud
d829e7003a
Merge pull request #1913 from Markolie/lawmanager
...
Port Bay's silicon law manager
2015-09-01 16:41:55 -04:00
Fox-McCloud
2b6e574587
Merge pull request #1891 from Markolie/eyes
...
Mechanicals eyes update
2015-09-01 16:41:42 -04:00
Markolie
3898ba87a7
Robotic eyes will not protect your from welding/the supermatter
2015-09-01 19:13:17 +02:00
KasparoVy
66f360e050
Adds and Implements CE Hardsuit Sprites and Item Icons
...
The CE hardsuit, while still being modkittable, will now take on the
appropriate sprites of the species it's being modified for.
Added Unathi and Tajaran mob and obj sprites for the helmet and suit,
created and added an 'on' (flashlight) state sprite as well.
2015-08-31 19:21:18 -04:00
Fox-McCloud
0e5b6fb1fa
Merge pull request #1918 from Markolie/fixes2
...
Fixes
2015-08-31 17:37:27 -04:00
Fox-McCloud
57a9fdcc59
Merge pull request #1910 from Markolie/syndistamp
...
Syndistamp
2015-08-31 17:15:01 -04:00
Fox-McCloud
41bfe1c3d0
Merge pull request #1911 from Markolie/bsa
...
Minor bluespace artillery interface update
2015-08-31 17:13:55 -04:00
KasparoVy
73637ccbe6
Implements Markolie's Suggestion
...
Condenses the code.
2015-08-31 16:39:08 -04:00
Tigercat2000
7f4ac72910
Progress bars + Wall Rationalization
...
This commit does the following:
- Ports progress bars from -tg- (tgstation/-tg-station#9921 )
- Refactors wall attackby code to make it 100% less insane; Instead of
manually checking every little thing, it uses do_after,
consequentially, making the new progress bars affect dealing with walls
as well.
Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
Markolie
5afc4c9cf1
Re-add respawn verb
2015-08-31 20:42:14 +02:00
Markolie
4c798a014e
Update ERT leader name
2015-08-31 20:10:49 +02:00
Markolie
b651eb36ce
Give members a predefined OOC color
2015-08-31 19:56:55 +02:00
Markolie
2b109d8400
Add BYOND member perks
2015-08-31 18:52:14 +02:00
Markolie
99764317de
Fix restart description
2015-08-31 17:47:58 +02:00
Markolie
ce6ad20cf9
Reboot improvements, player panel fix, IsBanned fix
2015-08-31 17:44:13 +02:00
KasparoVy
b6eec2b946
Hardsuit Standardization
2015-08-30 23:55:07 -04:00
KasparoVy
cdc714b8b4
Merge remote-tracking branch 'ParadiseSS13/master'
2015-08-30 22:55:12 -04:00
Fox-McCloud
4554b93266
Merge pull request #1901 from TheDZD/fluff-item
...
Kharshai Fluff Item
2015-08-30 21:38:00 -04:00
Markolie
b999ca32b8
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawmanager
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-08-31 02:23:24 +02:00
Markolie
5dc034719d
Port Bay's silicon law manager
2015-08-31 02:18:49 +02:00
Markolie
1cc4f7f483
Add syndicate stamp
2015-08-30 22:52:31 +02:00
Markolie
cd088909b0
Minor bluespace artillery interface update
2015-08-30 22:49:05 +02:00
KasparoVy
9a11454d3f
Fixes Tabbing @TheDZD
...
This has been one big learning experience. Anyway, dropped the tabbing and tested just to make absolutely sure. Everything's good. Thanks for pointing that out @TheDZD
2015-08-30 16:46:12 -04:00
KasparoVy
5b5825dedd
Adds the ishuman(user) Check
2015-08-30 16:22:34 -04:00
KasparoVy
e1c84f7e9d
Allows Vox Quills to Show Through Helmet
2015-08-30 16:11:17 -04:00
TheDZD
0904f16ed8
Merge pull request #1871 from Markolie/watchlist
...
Watchlist/admin updates
2015-08-30 14:43:43 -04:00
