Commit Graph

15796 Commits

Author SHA1 Message Date
Fox-McCloud
a82399a9e7 Oops 2015-03-29 18:14:11 -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
Fox-McCloud
27b5d5bb9f Merge pull request #671 from ZomgPonies/limb
Much downgraded Limb Overhaul
2015-03-29 00:44:03 -04:00
ZomgPonies
315d9572be Turn explosion delimbs into amputations due to explosion code overhaul 2015-03-29 00:40:09 -04:00
ZomgPonies
16e3830559 Goodbye limb parent damage overhaul, I barely knew ya. 2015-03-29 00:17:21 -04:00
ZomgPonies
9ecf61f43f Putting back some values for max limb health. 2015-03-29 00:11:26 -04:00
ZomgPonies
035ebc27fb Fix up delimb probabilities to be closer to current 2015-03-29 00:09:02 -04:00
ZomgPonies
fb988a1f36 Revert limb damage not counting towards overall health 2015-03-28 23:58:44 -04:00
ZomgPonies
72dea4c27c Merge pull request #695 from SamCroswell/EquiptmentEdits
CentComm Equip Update
2015-03-28 23:25:20 -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
SamCroswell
cdf14a47ea CentComm Equip Update
- Death Commandos now actually use the Death Commando frequency.
- Death Commandos have had their medical kits replaced with nanite
hyposprays.
- CentComm officers now spawn with a pulse pistol on their belt as
opposed to the useless base parent egun they got before.
- Remove the NT Rep equip option, as it's already available under the
'as job..' option.
- Merge the Spec Ops and Death Squad officer equip option
- Fixes the madmin malt's hellwater having the wrong ID.
2015-03-28 20:09:49 -04:00
DZD
c2551db339 Diona nymph hivemind fix and custom food
- You can now only put food into custom food, no more "the fire
extinguisher glass shard telescopic baton personal pizza"
- Fixes nymphs being able to learn hivemind languages.
2015-03-28 19:26:53 -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
a98b79728d formaldehyde 2015-03-28 06:08:32 -04:00
Fox-McCloud
361554d3b2 Forgot Nicotine in cigs 2015-03-28 05:38:15 -04:00
Fox-McCloud
6b96276637 hypospray tweaks 2015-03-28 05:03:37 -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
Iamgoofball
b58a76e4e0 FUCK 2015-03-27 18:44:42 -07:00
Iamgoofball
4a88b9b3f7 OOP shock and reagents, buffs overdose effects on meth, too many yakkity saxxers 2015-03-27 17:57:11 -07: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
ZomgPonies
e8936c5aec Merge pull request #674 from Fox-McCloud/borg-defib
Borg Defib Fixes
2015-03-26 10:55:09 -04:00
ZomgPonies
52ac2d5090 Merge pull request #673 from Fox-McCloud/superhair
[Goonchem] Further Goonchem Changes
2015-03-26 10:53:49 -04:00
Fox-McCloud
b358a8ba1d oops 2015-03-26 10:31:13 -04:00
Fox-McCloud
56d6d7c9c8 Fixes 2015-03-26 10:27:04 -04:00
Fox-McCloud
abf409149d more tweaks and additions 2015-03-26 09:43:13 -04:00
Fox-McCloud
42d2373c01 Borg Defib Fixes 2015-03-26 01:14:41 -04:00
Fox-McCloud
29ab8700e9 adjustments 2015-03-25 23:30:47 -04:00