28d1e9bad2
Several additions and new sprites.
...
Reverts glasses.dm
2015-02-14 19:24:41 +00:00
135293bedf
Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
...
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
c66327318d
adds megaphones
2015-02-13 15:07:15 -08:00
54040d9867
stun changes and stun revolver
2015-02-13 09:26:31 -08:00
940601bcfa
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-13 01:14:52 +08:00
216630f1db
Merge pull request #7572 from phil235/CookingOverhaul
...
Cooking overhaul
2015-02-12 08:01:17 -06:00
549b71a487
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
...
Conflicts:
icons/obj/drinks.dmi
Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
65e8a4ce31
Merge pull request #7624 from paprka/defibfuckupv2
...
Defib changes
2015-02-11 08:37:28 -06:00
3e61bba236
defib changes
2015-02-08 17:06:34 -08:00
91c1a54abd
closes the open()
2015-02-08 23:33:33 +01:00
732a54fe63
Making all meat subtypes of snacks/meat
...
Adding specific cutlets and raw cutlets for a lot of types of meat.
Enabling reagent transfer from ingredients to resulting dish for foodtablecrafting
Adjusting tablecraft food recipes reagents accordingly.
Adding raw pastry base and pastry base food and including it into certain recipes.
2015-02-08 21:36:54 +01:00
424dd37782
hard-light holotape
2015-02-08 07:29:10 -08:00
4e18859e7b
fixes lockers/bodybags/etc. shielding you from explosions. whoops!
2015-02-08 15:13:04 +01:00
08e7911f57
fixes a bunch of bugs
2015-02-08 13:27:55 +01:00
35fb458293
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
...
Conflicts:
code/modules/food&drinks/food/snacks_other.dm
icons/obj/drinks.dmi
2015-02-07 20:22:49 +01:00
c527491f41
Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
fdb9c92736
Merge pull request #7494 from paprka/dirsigns
...
Adds directional signs from bay
2015-02-05 16:28:26 -06:00
e4464b3b9f
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
2015-02-05 22:35:00 +01:00
6fab02e7cd
Merge pull request #7546 from TZK13/Purple-Shorts
...
Adds purple shorts
2015-02-05 18:16:14 +01:00
faba71fcca
Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)
...
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
2015-02-05 16:48:25 +01:00
cd9a08e684
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
code/modules/projectiles/ammunition/energy.dm
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-04 18:36:50 +08:00
01bf5b343f
Adds purple shorts.
2015-02-04 01:23:58 -06:00
8400ec9800
Adds work boots and fixes character setup previews.
2015-02-04 00:32:15 -06:00
495ae29ab8
helmet, armor, and corgi changes
2015-02-03 19:12:38 -08:00
11463998e6
Merge branch 'master' of https://github.com/tgstation/-tg-station into dirsigns
2015-02-03 14:56:23 -08:00
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
784766e8cc
Merge pull request #7509 from paprka/gunstuff
...
Improves pulse guns, ERT, and centcomm areas
2015-02-03 16:14:48 -06:00
890b3800e6
some clothing changes
2015-02-03 09:00:51 -08:00
bbfad5b137
Merge pull request #7488 from paprka/memetiersprioite
...
fixes janicart
2015-02-02 19:37:28 -08:00
6de33d4063
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
...
Conflicts:
_maps/map_files/generic/z2.dmm
2015-02-02 19:13:49 -08:00
9bddcb3df4
Merge pull request #7492 from xxalpha/spacesuit_storage
...
Repath all non jetpack tank types to tank/internals
2015-02-02 18:52:51 +01:00
18a90495b2
updates to ERT stuff
2015-02-02 03:33:37 -08:00
a5dcd1abd8
improves ert spawning and centcomm
2015-02-01 21:16:11 -08:00
55bdca20da
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
2015-02-01 18:22:02 -08:00
a9c181bbcc
Repath all non jetpack tank types to tank/internals
...
Repath all portable tanks to tank/internals, except jetpacks
Update ministation
2015-02-01 18:25:39 +00:00
95e4cf1ffa
adds directional signs from bay
2015-02-01 06:13:21 -08:00
77dabb02fe
fixes janicart
2015-02-01 03:09:09 -08:00
a661e58281
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-31 22:03:00 -08:00
b1ff5dd6de
Merge pull request #7418 from paprka/kekwalk
...
Some catwalk fixes
2015-02-01 03:32:43 +00:00
fd88ccc024
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
2015-01-31 18:03:38 +08:00
453a3db196
etc
2015-01-30 23:18:02 -08:00
c8e3b33687
(｡´>д<)っ彡☆
...
Y'all making me do actual refactoring in a silly pull
2015-01-29 18:59:25 -05:00
b5ec328983
New contraband supply item: 50 butterflies
...
(◕‿◕✿)
2015-01-29 18:07:34 -05:00
bb9be1ac98
HoSGun
2015-01-29 15:35:39 +08:00
ac85775b02
catwalk fixes
2015-01-28 19:30:21 -08:00
b830f77ea2
Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-01-26 15:37:33 -08:00
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
f7730eeaef
Merge pull request #7087 from paprka/readdjanikart
...
Improves janicart and adds secway
2015-01-26 00:31:30 +00:00
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
xxalpha
phil235
paprka
Steelpoint
Cheridan
Kraseo
Swag McYolosteinen
TZK13
hornygranny
Remie Richards
Incoming