hornygranny
|
82a7beb02c
|
Merge pull request #7888 from xxalpha/crayonruntimes
Add initialize for crayons and fix runtime error.
|
2015-02-22 20:19:55 -08:00 |
|
hornygranny
|
c0c8a739e2
|
Merge pull request #7721 from paprka/miening
Mining & mine-related chem changes
|
2015-02-22 20:17:24 -08:00 |
|
xxalpha
|
cf05a587f9
|
Code tweak.
|
2015-02-22 13:58:15 +00:00 |
|
Swag McYolosteinen
|
1035d95f90
|
Merge pull request #7716 from paprka/megaphoney
Adds megaphones
|
2015-02-22 12:58:49 +01:00 |
|
paprka
|
d8e3f7f28a
|
fixes usr.stat
|
2015-02-22 03:37:02 -08:00 |
|
xxalpha
|
f2a27ade31
|
Add initialize for crayons and fix runtime error.
|
2015-02-22 02:49:56 +00:00 |
|
phil235
|
68942e1ace
|
Merge pull request #7686 from xxalpha/newgraffiti
New graffiti.
|
2015-02-21 12:46:45 +01:00 |
|
Razharas
|
55208e408d
|
Merge pull request #7419 from paprka/beltoveray
adds a simple overlay system for belts
|
2015-02-20 07:06:20 +03:00 |
|
phil235
|
66720a5ce9
|
Merge pull request #7834 from Menshin/telexploit_fix
Deactivates the Hidden Syndicate Teleportation Device
|
2015-02-19 16:39:49 +01:00 |
|
Menshin
|
0d0ef9e02a
|
Deactivates the Hidden Syndicate Teleportation Device
|
2015-02-19 16:34:49 +01:00 |
|
paprka
|
dc4c4ea90b
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into megaphoney
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
|
2015-02-18 23:15:15 -08:00 |
|
hornygranny
|
7905cc618d
|
Merge pull request #7773 from phil235/HoloSignFix
Fixes the holosign projector sign count not increasing after destroying old signs.
|
2015-02-18 12:59:50 -08:00 |
|
phil235
|
cf3f03c039
|
Merge pull request #7479 from paprka/batonshit
Makes batons slowly lose charge when left on
|
2015-02-18 21:49:25 +01:00 |
|
phil235
|
6ebd5976f5
|
Merge pull request #7729 from Incoming5643/mediborg_gauze
Mediborg Improvement Drive: The man in gauze
|
2015-02-17 18:17:59 +01:00 |
|
phil235
|
67f4cc75d9
|
Fixes the holosign projector not increasing after destroying old signs.
|
2015-02-16 22:57:06 +01:00 |
|
Cheridan
|
15439b8c4e
|
Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
Conflicts:
code/game/gamemodes/wizard/artefact.dm
|
2015-02-15 10:27:50 -06:00 |
|
Cheridan
|
76f101de63
|
Merge pull request #7614 from paprka/preffer
Hard-light hazard holotape
|
2015-02-14 21:59:14 -06:00 |
|
paprka
|
743af3a5b2
|
processing |=
|
2015-02-14 19:43:27 -08:00 |
|
paprka
|
b2071bfdbf
|
borg updates
|
2015-02-14 17:38:17 -08:00 |
|
paprka
|
f6942bb955
|
Merge branch 'miening' of https://github.com/paprka/-tg-station into miening
|
2015-02-14 17:26:19 -08:00 |
|
paprka
|
b67f9cec72
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into miening
|
2015-02-14 17:08:39 -08:00 |
|
paprka
|
bcd76fc64c
|
fixes redundant passglass
|
2015-02-14 15:15:22 -08:00 |
|
paprka
|
7f56edaa30
|
compile fix
|
2015-02-14 15:00:54 -08:00 |
|
paprka
|
03e93a43b7
|
wazer tape
|
2015-02-14 15:00:02 -08:00 |
|
paprka
|
6263436bbb
|
holotaeb
|
2015-02-14 14:49:04 -08:00 |
|
Cheridan
|
5e0e4828bd
|
Merge pull request #7706 from phil235/TrackImplantFix
Fix tracking implant description when inserted inside implant pad.
|
2015-02-14 15:57:16 -06:00 |
|
paprka
|
24cef3c30a
|
fixes baton looping
|
2015-02-14 12:41:37 -08:00 |
|
Incoming
|
2885470c50
|
Adds gauze to Mediborgs, it can be regenerated in chargers much the same as the engiborgs materials
|
2015-02-14 13:45:23 -05:00 |
|
phil235
|
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 |
|
Iamgoofball
|
c119fede36
|
sponsored by DaZe
|
2015-02-13 23:40:43 -08:00 |
|
paprka
|
85675e92b8
|
my good judgement gets the better of me
|
2015-02-13 21:50:00 -08:00 |
|
paprka
|
88760896ad
|
initial commit
|
2015-02-13 20:59:39 -08:00 |
|
paprka
|
46d21ae2c2
|
robots lose power from their cell for leaving their baton active
|
2015-02-13 17:48:58 -08:00 |
|
paprka
|
c66327318d
|
adds megaphones
|
2015-02-13 15:07:15 -08:00 |
|
xxalpha
|
5028067061
|
Remove unwanted cyka.
|
2015-02-13 20:35:09 +00:00 |
|
xxalpha
|
26ecb9cc96
|
Adds new graffiti: cyka, prolizard, antilizard.
|
2015-02-13 20:29:52 +00:00 |
|
phil235
|
9bd3c1d8a6
|
Fix tracking implant description when inserted inside implant pad.
|
2015-02-13 20:09:48 +01:00 |
|
phil235
|
897618d42f
|
Fixed some recipes in chef recipes book. Fixed jelly sandwich recipes. Remove unused milk/soymilk carton sprites from drinks.dmi
|
2015-02-12 21:39:20 +01:00 |
|
Cheridan
|
216630f1db
|
Merge pull request #7572 from phil235/CookingOverhaul
Cooking overhaul
|
2015-02-12 08:01:17 -06:00 |
|
Remie Richards
|
6613851028
|
Merge pull request #7593 from Cheridan/pin_fix
Pin fixes, additions
|
2015-02-12 06:43:11 +00:00 |
|
phil235
|
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 |
|
Cheridan
|
ee75ba2acd
|
Merge pull request #7639 from GunHog/RollyPollyBorgies
Adds movement states for some cyborgs + overlay for miner jetpack
|
2015-02-11 09:02:09 -06:00 |
|
Cheridan
|
65e8a4ce31
|
Merge pull request #7624 from paprka/defibfuckupv2
Defib changes
|
2015-02-11 08:37:28 -06:00 |
|
Swag McYolosteinen
|
cfacd3bf9f
|
Merge pull request #7589 from Menshin/reagents_warnings_fix
Fixes warnings related to add_reagent
|
2015-02-10 17:55:32 +01:00 |
|
Swag McYolosteinen
|
147b2fc28a
|
Merge pull request #7578 from Deantwo/BoomBoomBoom
Fixes stock grenades
|
2015-02-10 17:47:29 +01:00 |
|
Swag McYolosteinen
|
6542a0b706
|
Merge pull request #7620 from xxalpha/briefcasescam
Fix syndicate briefcase not having cash.
|
2015-02-10 17:42:15 +01:00 |
|
Swag McYolosteinen
|
da326b30d3
|
Merge pull request #7553 from Menshin/yet_another_atmos_fix_bundle
Yet Another Atmos Fixes Bundle
|
2015-02-10 17:41:56 +01:00 |
|
GunHog
|
8465c965c0
|
Adds movement states for some cyborgs
Mining and Mediborgs get new movement states.
Janiborg scubbers will only move when the borg does.
Made mining borg jetpack an overlay.
|
2015-02-10 00:44:38 -06:00 |
|
phil235
|
e1412250da
|
Merge pull request #7601 from Menshin/rods_icon_fix
Fixes icon updating for rods
|
2015-02-09 20:06:01 +01:00 |
|
paprka
|
8150750a4d
|
removes unnecessary else if(
|
2015-02-09 10:29:59 -08:00 |
|