Commit Graph

9304 Commits

Author SHA1 Message Date
Fox-McCloud
ff5ec1df54 meh 2015-04-03 05:32:53 -04:00
Fox-McCloud
0efdc07191 [Goonchem] Few Recipes Tweaks 2015-04-03 01:25:42 -04:00
Fox-McCloud
3bcbd2488c [Goonchem] Few New Reagents 2015-04-02 05:04:20 -04:00
ZomgPonies
8890d6cbea Merge pull request #706 from Fox-McCloud/Dropper
[Goonchem] Pipettes, Fixes, and Tweaks (again)
2015-03-31 22:24:01 -04:00
Fox-McCloud
d87730d7b3 fixes 2015-03-31 03:23:45 -04:00
ZomgPonies
f7fb4f0376 Merge pull request #703 from Svej/ntrephat
Nanotrasen Representative hat
2015-03-30 13:54:26 -04:00
Svej
a0e1cd5683 Nanotrasen Representative hat
Adds a fancy hat to the NT Reps locker
2015-03-30 14:10:28 +02:00
ZomgPonies
7262eace42 Merge pull request #700 from Fox-McCloud/more-goontweaks
[Goonchem] Even More Tweaks and Fixes
2015-03-29 20:22:12 -04:00
ZomgPonies
48ad4e346b Merge pull request #702 from SamCroswell/DeathCommandoFixes
DS Radio and Rapid Deployment Fixes
2015-03-29 20:22:03 -04:00
SamCroswell
63337efdb8 DS Radio and Rapid Deployment Fix 2015-03-29 19:25:32 -04:00
Fox-McCloud
ae9fc03548 Disables Perma-Spinning (for now) 2015-03-29 19:05:59 -04:00
Fox-McCloud
d44688f7b9 [Goonchem] Even More Tweaks and Fixes 2015-03-29 17:57:12 -04:00
ZomgPonies
7e1f7a0b22 Merge pull request #680 from tigercat2000/spiritboard
Spirit Boards! (from -tg-)
2015-03-29 01:02:59 -04:00
ZomgPonies
0b630c4ca7 Merge pull request #691 from jack-fractal/pda_logs
Adding extra logging information to PDA for refactor prep
2015-03-29 01:02:05 -04:00
ZomgPonies
46aaed0ca9 Merge pull request #694 from TheDZD/minor-fixes
Bugfixes and Custom Food Sanity
2015-03-28 23:24:17 -04:00
ZomgPonies
7dc292f472 Merge pull request #696 from Fox-McCloud/Goon-tweaks
[Goonchem] Tweaks, Fixes, etc.
2015-03-28 23:23:47 -04:00
ZomgPonies
40926b5c86 Merge pull request #697 from Fox-McCloud/Spinning
You Spin Me Right Round
2015-03-28 23:23:37 -04:00
Fox-McCloud
d4de91ce15 You Spin Me Right Round 2015-03-28 23:17:00 -04:00
Fox-McCloud
7dc856c86c Merge pull request #686 from tigercat2000/CryoSpritey
Cryo will now show occupant inside on sprite. (Bayport)
2015-03-28 22:57:08 -04:00
Fox-McCloud
796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
DZD
e5b8684cc6 Bugfixes
- Fixes wizard's No Clothes "spell" costing 3 points instead of 2.
- Fixes adminbooze containing a misspelled adminordrazine reagent and
runtiming.
2015-03-28 17:56:56 -04:00
jack-fractal
f62f91f04e Adding extra logging information to PDA
This significantly expands the level of detail for logging what PDAs.
2015-03-28 15:32:11 -04:00
ZomgPonies
e2a4ccc8a6 Merge pull request #681 from Fox-McCloud/End-Era
[Goonchem] Transition to Goonchem
2015-03-28 12:25:35 -04:00
Tigercat2000
4259e589a2 Sprite stuff for cryo 2015-03-28 11:36:09 +01:00
Fox-McCloud
361554d3b2 Forgot Nicotine in cigs 2015-03-28 05:38:15 -04:00
Fox-McCloud
1e7c0a4825 fixes 2015-03-28 04:34:48 -04:00
Tigercat2000
5253f58700 betterer sprites, bob animation 2015-03-28 03:50:23 +01:00
Chinsky
e364c3b560 Cryo will now show occupant inside on sprite. 2015-03-28 01:48:18 +01:00
Artorp
046096684b Revert "Change space law iframe wiki link" 2015-03-27 23:53:52 +01:00
Fox-McCloud
a40ee14f2c Forgot 2015-03-27 07:19:13 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Tigercat2000
202f8e81d8 Make actually work, grgrgr. 2015-03-26 21:03:23 +01:00
Cheridan
6796dcce29 Adds logging, fixes typo 2015-03-26 20:11:02 +01:00
Tigercat2000
b4a2d26274 fixstrangestuff 2015-03-26 20:10:45 +01:00
Cheridan
d012d77a7d Spirit Boards!
Conflicts:
	icons/obj/objects.dmi
	tgstation.dme
2015-03-26 20:00:44 +01:00
Tigercat2000
b8101ed6be w_classes, NEED W_CLASSES, gaah. 2015-03-26 19:21:32 +01:00
Tigercat2000
62f72163c7 Compileerrorfix, update items.dmi 2015-03-26 19:00:25 +01:00
Tigercat2000
18072a8539 Replace other instances of item/blueprint 2015-03-26 18:55:31 +01:00
Cheridan
acba4c6cf6 Adds construction permits
Conflicts:
	code/game/gamemodes/objective_items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/paperwork/photography.dm
	icons/obj/items.dmi
2015-03-26 18:52:29 +01:00
Fox-McCloud
d90167193a Merge pull request #670 from ZomgPonies/court
Adds gavel and block to magistrate
2015-03-26 11:01:35 -04:00
Fox-McCloud
42d2373c01 Borg Defib Fixes 2015-03-26 01:14:41 -04:00
ZomgPonies
d604a50dd8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into court
Conflicts:
	icons/obj/items.dmi
2015-03-25 10:23:14 -04:00
ZomgPonies
7fdfa9c6a7 Adding gavel and block 2015-03-25 10:22:04 -04:00
Fox-McCloud
4d2a77dbf7 Merge pull request #653 from ZomgPonies/headspear
Sticking heads on spears
2015-03-25 09:37:36 -04:00
Fox-McCloud
b3270fe360 Merge pull request #650 from ZomgPonies/beartraps
IED fix and trap
2015-03-25 09:37:08 -04:00
ZomgPonies
17dfe4e481 Merge pull request #668 from Fox-McCloud/Goonchem-Stuffs
[Goonchem] FirstAid Transitions and Chem Adjustsments+Fixes
2015-03-25 09:33:21 -04:00
Fox-McCloud
33293763f4 gauze is gauze. Shocker 2015-03-25 09:03:20 -04:00
Fox-McCloud
3e1fac8c94 [Goonchem] FirstAid Transitions 2015-03-25 08:45:36 -04:00
Fox-McCloud
dbb04f4dbb [Goonchem] Few Additional Chemicals 2015-03-25 03:50:54 -04:00
Fox-McCloud
84a659605d Merge pull request #663 from Iamgoofball/muh_doctors_delight
MUH FIXES
2015-03-25 00:18:05 -04:00