SkyMarshal 5ab20fdf55 Merge branch 'master' of git://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/items/weapons/uplinks.dm

2011-12-29 10:08:58 -07:00

..

area

Fucked up, NOW space is depowered.

2011-12-04 01:27:44 +00:00

asteroid

Revert "removed cloaker"

2011-12-08 15:28:35 +02:00

gamemodes

Fixes and stuff.

2011-12-28 14:27:52 -07:00

jobs

only force AI if malf mode

2011-12-28 01:18:16 -05:00

machinery

Cloning now leaves you on the verge of death again(though not in critical).

2011-12-28 23:55:36 -08:00

magic

accidentally didn't allow a natural in piano, thought it sounded weird!

2011-12-28 07:02:55 -05:00

mecha

Attempted to fix a runtime error.

2011-12-28 11:11:45 +02:00

objects

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2011-12-29 10:08:58 -07:00

structure

…

verbs

replaced "toggle pregame music" with button in pregame screen that saves between games

2011-12-27 19:53:02 -05:00

algorithm.dm

2 ears!

2011-12-18 06:02:15 -05:00

atom_procs.dm

Fixed runtime error involving cyborgs and fibers.

2011-12-10 11:27:48 -05:00

cellautomata.dm

TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure.

2011-12-26 23:39:45 +02:00

chemistry.dm

…

communications.dm

…

dna_mutations.dm

…

dna.dm

TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure.

2011-12-26 23:39:45 +02:00

hud.dm

2 ears!

2011-12-18 06:02:15 -05:00

json.dm

Fixed json thing

2011-12-12 01:33:47 +10:30

landmarks.dm

…

master_controller.dm

…

prisonshuttle.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

TG update: removed title music from bar

2011-12-26 23:33:20 +02:00

specops_shuttle.dm

…

status.dm

…

supplyshuttle.dm

Merge pull request #85 from Tastyfish/master

2011-12-10 02:42:21 -08:00

syndicate_shuttle.dm

…

syndicate_specops_shuttle.dm

…

throwing.dm

Numerous fixes.

2011-12-25 10:57:23 -07:00

topic.dm

…

turf.dm

TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure.

2011-12-26 23:39:45 +02:00

vials.dm

TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure.

2011-12-26 23:39:45 +02:00

vote.dm

custom votes

2011-12-26 11:24:28 -05:00