ZomgPonies
7ccdcbce93
Preleminary work on robolimbs. Expect more soon.
2014-05-25 18:45:49 -04:00
Jeremy Liberman
b3d3f5df8c
Mutiny fix prereqs for directives
...
Conflicts:
code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
code/game/gamemodes/mutiny/directives/terminations_directive.dm
code/game/gamemodes/mutiny/directives/test_directive.dm
code/modules/mob/mob.dm
code/modules/mob/new_player/new_player.dm
2014-05-25 22:34:39 +02:00
ZomgPonies
11a1deb1ac
Trying to cut down on attack lock spam
2014-05-24 17:17:38 -04:00
ZomgPonies
b81acff7a3
Fix charge_costs of guns
2014-05-24 14:03:37 -04:00
ZomgPonies
0b2fd89f55
Hopefully fix vending machines
2014-05-24 13:49:21 -04:00
ZomgPonies
f5e69887a1
Fix Taj/Unathi/Whatever skin color. Let FurryRaveStation13 continue!
2014-05-24 08:24:09 -04:00
ZomgPonies
c25b72b83e
Merge pull request #220 from Regen1/Hyperzine-fix
...
Hyperzine fix
2014-05-24 07:52:42 -04:00
Regen
4b94406efb
Nerfs for OD
2014-05-23 23:10:04 +02:00
ZomgPonies
d099ca5a19
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-05-23 14:32:01 -04:00
ZomgPonies
fac32af2f1
First commit of liquid simulation stuff
2014-05-23 14:31:29 -04:00
Regen
d6702496f9
Hyperzine fix
...
Now lasts shorter and isn't deadly at 5 units
2014-05-23 17:33:34 +02:00
alex-gh
be8d9eb026
Fixed spaceacillin metabolism, its useful again
2014-05-23 10:53:26 +02:00
ZomgPonies
6faa9e3be9
Forgot this
2014-05-23 02:18:41 -04:00
ZomgPonies
a521f88e95
Final dodgeball fixes
2014-05-23 01:15:24 -04:00
ZomgPonies
cbd1148d12
Every round ender needs a good theme song. TODO: Switch all these to play from a global jukebox in streaming.
2014-05-23 00:06:46 -04:00
ZomgPonies
e191f93767
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-05-22 23:50:23 -04:00
ZomgPonies
20184bb9cd
Ccomp fixes to mesons
2014-05-22 23:49:57 -04:00
Mloc-Argent
1b2f83dee4
BS12 Hooks
2014-05-22 23:56:35 +02:00
ZomgPonies
a2a50586b0
Trying to fix dodgeball
2014-05-22 15:49:34 -04:00
ZomgPonies
0c1a77e346
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-05-22 14:21:47 -04:00
ZomgPonies
342f8c4042
Fixed up Highlander and Dodgeball
2014-05-22 14:21:29 -04:00
Regen
7c710186e2
Armalis bugfixes
...
Also slightly changed admin chat color again
2014-05-22 18:57:33 +02:00
ZomgPonies
408379ab6a
vg economy overhaul
2014-05-20 22:51:02 -04:00
ZomgPonies
69725d9466
Revert "Refactored, simplified access system a bit. Tested, for once."
...
This reverts commit a5e65d9b2b
2014-05-20 20:58:23 -04:00
Regen
3959cbd634
Changed color of Asay to a more notable one
2014-05-20 23:18:29 +02:00
ZomgPonies
557a97f0fc
Tied gravity to the actual grav generator
2014-05-20 22:59:25 +02:00
ZomgPonies
7bf3f18cce
Renamed Atmos Tech to life support specialist due to new grav gen responsabilities
2014-05-20 22:59:24 +02:00
UristMcKerman
9f201399e6
Quick fix to TEG
...
When one of TEG circulator intakes had gas while the other had no (null)
the air in the first used to be deleted. Fixed this behavior.
2014-05-20 22:59:24 +02:00
Rob Nelson
a5e65d9b2b
Refactored, simplified access system a bit. Tested, for once.
...
* Mobs provide GetAccess() and hasFullAccess()
* Human GetAccess() provides the "best" accesses available combined from all conventional sources.\
* Silicons have hasFullAccess()
* AdminGhosts also provide full access.
Conflicts:
code/game/jobs/access.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/mob/mob.dm
html/changelog.html
2014-05-20 22:59:23 +02:00
Regen
1cb87e07cf
Made Cyanide more deadly, added OD to Hyperzine
...
Because fuck those who OD on Hyperzine, and Cyanide needs to kill faster
(not like cyanide is used by anyone else than Nukeops anyways)
2014-05-20 16:43:35 +02:00
UncleSporky
75114a326a
Adds the Guy Fawkes mask to Autodrobe and spawn
...
Conflicts:
code/game/machinery/vending.dm
code/game/objects/effects/landmarks.dm
code/modules/clothing/masks/miscellaneous.dm
icons/mob/mask.dmi
icons/obj/clothing/masks.dmi
2014-05-20 06:39:19 -04:00
Vas
22a22ea6bc
Space Adaptation was actually BAD instead of GOOD (overdose with reagents)
...
Conflicts:
code/modules/virus2/effect.dm
2014-05-19 19:39:29 -04:00
ESwordTheCat
a6ee8dc678
Revert gun pool for now.
...
Conflicts:
code/game/machinery/turrets.dm
code/modules/projectiles/projectile/beams.dm
2014-05-19 19:34:20 -04:00
alex-gh
54db12f702
Merge pull request #206 from alex-gh/mutiny_fixes
...
Merged latest mutiny fixes.
2014-05-19 19:56:10 +02:00
alex-gh
4dc1e5c0b3
Merged latest mutiny fixes.
2014-05-19 19:54:42 +02:00
ZomgPonies
96ee35e5de
Added Mechanic karma job, builds and repairs spacepods, works under the CE
2014-05-19 06:49:35 -04:00
ZomgPonies
f2376198ff
Fix highlander clothing update maybe?
2014-05-19 06:14:55 -04:00
ZomgPonies
bfd6132f93
Makes morgue and genetics less of a puke stained shitholes. Closed bodybags and medical masks stop people from puking from bodies now.
2014-05-18 19:15:51 -04:00
ZomgPonies
d2c82c2111
Compile fix
2014-05-18 19:03:42 -04:00
Rob Nelson
61609ab2f9
Add superjuke, fix more bugs with joukbucks.
...
Conflicts:
code/modules/media/jukebox.dm
2014-05-18 18:47:30 -04:00
Rob Nelson
f1e09dd3e1
More juke bugs
2014-05-18 18:43:55 -04:00
Rob Nelson
48978767c8
Jukebox casters should work now. (Tested)
2014-05-18 18:43:44 -04:00
alex-gh
01b41acf06
Removed game-breaking virology effect
2014-05-18 17:59:58 +02:00
alex-gh
8f600162ef
Virology symptom fixes.
...
Cleaned up and reordered symptoms.
Removed unneeded whitespace.
Made some of the symptoms less cruel.
Fixed non-working symptoms because of missing multiplier
2014-05-18 13:42:38 +02:00
ZomgPonies
73f12189b7
First step in regrouping all non-spell abilities under the same tab to facilitate UI navigation.
2014-05-18 00:58:25 -04:00
Rob Nelson
6a0cc4a43b
Fix buggy robot MMI removal.
2014-05-17 22:05:45 -04:00
Rob Nelson
b66d0b002f
Jukebox supports being moved.
2014-05-17 22:04:50 -04:00
Zuhayr
0505b4f5f8
Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag.
...
Conflicts:
baystation12.dme
code/modules/mob/emote.dm
2014-05-17 22:00:39 -04:00
Zuhayr
63f3e5ccd9
Adds PASSEMOTES flag to setup.dm, dionaea and borers.
...
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
code/modules/mob/living/simple_animal/borer.dm
2014-05-17 21:57:10 -04:00
Ccomp5950
8a17208a2b
Humanoid mobs won't default to having an undershirt.
2014-05-17 21:20:51 -04:00
