Segrain
55605624eb
Gamemode autovote.
2014-02-03 04:43:38 +03:00
Segrain
b7059519c2
Merge remote-tracking branch 'upstream/master' into dev
2014-02-03 04:36:03 +03:00
DJSnapshot
810de4ddaa
Merge pull request #4337 from Baystation12/dev-freeze
...
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
Segrain
4c87838e64
Double call removal.
2014-01-31 16:19:22 +03:00
Segrain
9fdd34b1ba
Removal of double reporting.
2014-01-31 00:28:25 +03:00
Segrain
9a70dd3d13
Objectives fix.
2014-01-31 00:25:44 +03:00
Segrain
75c88634f7
Definition usage.
2014-01-31 00:22:24 +03:00
Ccomp5950
975433f898
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
icons/mob/back.dmi
icons/mob/mask.dmi
2014-01-30 12:14:44 -06:00
Zuhayr
f08e6c804d
Rogue comma, kill it.
2014-01-30 23:33:57 +10:30
Zuhayr
97442f4727
Adding Kilakk's fix for #4145
2014-01-30 22:31:22 +10:30
Zuhayr
9d7b42f6b6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-27 20:55:42 +10:30
Ccomp5950
ddca656672
RP-revconvert bugfix
...
Now only humans that are logged in, alive, and not already a revolutionary (no special_role) show up in the list.
Instead of EVERY mob type (simple_animals, borgs, etc.)
2014-01-25 23:36:11 -06:00
Zuhayr
5709dc2629
Fixes so ladders actually connect and function now.
2014-01-25 04:16:18 +10:30
Furlucis
7dd5968f76
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-17 03:05:04 -05:00
Furlucis
88181a8057
Tweaks homunculi
...
Makes them a bit creepier, and makes it so they don't spawn with
underwear. Because really, if the rune spawns anything, it should be
robes. But that would make things too easy.
2014-01-17 03:00:32 -05:00
Zuhayr
adaccb3c3e
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-11 10:45:57 +10:30
DJSnapshot
e524d2112f
Merge pull request #4244 from LightningIron/master
...
Ninja bugfixes/minor code cleaning/energy cost changes
2014-01-10 13:42:42 -08:00
Mloc-Argent
4c1e17649e
Merge remote-tracking branch 'upstream/master' into dev
2014-01-10 20:07:47 +00:00
DJSnapshot
1e4abf785e
Merge pull request #4237 from Mloc/bs12-tgstuff
...
[TG] Lots of small (and maybe not so small) changes from tg.
2014-01-09 22:33:28 -08:00
DJSnapshot
418a4b3631
Merge pull request #4247 from Zuhayr/master
...
Cryostorage fixes.
2014-01-09 14:39:08 -08:00
RKF45
c47be94b42
Removes braindeath as IC term
2014-01-09 21:49:21 +01:00
Mloc-Argent
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
LightningIron
8c26c23157
Merge remote-tracking branch 'upstream/master'
2014-01-09 11:15:26 -06:00
Zuhayr
f311177654
Changed world loop to all_objective loop in cryopod check. Added all_objective add/remove procs to datum/objective.
2014-01-10 01:24:24 +10:30
LightningIron
24be1d4a23
Fixed accidental change of ninja cell to super capacity.
2014-01-08 21:10:17 -06:00
LightningIron
7a37eac624
Miscellaneous ninja fixes and ability cost changes (because nearly all were inconsistent with listed/actual cost), e-net fix
2014-01-08 20:52:51 -06:00
Zuhayr
b2da52098a
Removing my debug changes.
2014-01-09 13:07:02 +10:30
Zuhayr
68499b4ae2
Fixes #4151
2014-01-09 12:57:27 +10:30
Mloc-Argent
be153d14a3
Fixes for the tg cherrypicks.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-01-08 20:32:35 +00:00
Giacomand
363b8e82da
Tweaked meteors to stop playing unnecessary sounds.
...
Made meteors shake the screen more if you're closer and shake the screen of everybody on the station a little (big meteors only).
2014-01-08 20:05:33 +00:00
Zuhayr
2c492d8289
Using DNA2 files from master.
2014-01-03 11:19:40 +10:30
Kilakk
7a75242640
Where the hell did this even come from?
...
I should probably start checking for these things
2014-01-01 13:46:21 -05:00
Kilakk
3f4646ed58
Fixed centcomm status reports listing vox raiders
...
* It would say something like "Kikichata, the MODE"
* Which is hilarious, but still
2014-01-01 13:28:52 -05:00
Zuhayr
9d4d14f107
Fix for low oxy tank at ninja spawn.
2013-12-31 11:37:21 +10:30
Zuhayr
4c371a3d0b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-12-31 10:25:54 +10:30
DJSnapshot
7a7eca4393
Merge pull request #4146 from Baystation12/dev-freeze
...
Dev-freeze --> Master staging [Going live!]
2013-12-30 13:52:21 -08:00
Kilakk
c7f840de73
Fixes #4145 , nuke ops can choose their names on spawn-in
2013-12-30 15:38:02 -05:00
Zuhayr
5ca939fd39
Nuke starting condition rebalance, op number scaling rebalance.
2013-12-30 14:03:48 -05:00
Zuhayr
19c963ac73
Revised commit due to Mloc's suggestion.
2013-12-31 04:24:53 +10:30
Zuhayr
6888651da6
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2013-12-28 23:14:43 +10:30
Zuhayr
c6c1a575d6
Merge of blood file, ammo icons, map. Manual binary file merge incoming.
2013-12-28 23:13:04 +10:30
Zuhayr
ba018c84af
Typo.
2013-12-28 23:07:29 +10:30
Zuhayr
e9e5dd4ebe
Map merge resolution.
2013-12-28 23:05:23 +10:30
Zuhayr
9f98909ce8
Nuke starting condition rebalance, op number scaling rebalance.
2013-12-28 23:00:42 +10:30
Mloc
1967a17715
Merge pull request #4126 from Zuhayr/dev-freeze
...
Removal of corgi dressup, uncommenting of ninja block in Check Antags.
2013-12-27 06:59:14 -08:00
Zuhayr
183afc61bf
Reverts corgi dress-up due to being terrible and duplicating items.
2013-12-27 11:06:20 +10:30
DJSnapshot
4f4e9bb000
Fix for the nuke disarm menu not showing up.
2013-12-26 16:27:05 -08:00
Zuhayr
661593718f
Using dev-freeze map.
2013-12-27 10:42:13 +10:30
DJSnapshot
efdeea5bab
Nerf to shield blobs.
...
Now they take 2 hits instead of 3, that way they are a little easier to deal with and hopefully not as much meta will have to occur.
2013-12-26 13:20:38 -08:00
Ccomp5950
fb78caf9a5
Fixes Power Grid checks killing the AI's SMES.
...
Added the turrent protected check to restore_power() that is already in power_failure()
2013-12-22 08:38:26 -06:00
