58cd8c3e03
Added debug verbs/feedback.
2015-09-05 12:05:32 +09:30
8c743329df
Merge pull request #10955 from SkyMarshal/multi-z
...
Overhauls Multi-Z
2015-09-05 11:36:59 +09:30
12a5c47413
Added a proper cooldown on latespawn, added loyalist role to char setup.
2015-09-05 10:46:23 +09:30
e4267ea449
Adds chemical meter on HUD.
2015-09-04 16:57:55 -04:00
ddeec9c89a
Fix effects for clonexadone
2015-09-04 16:06:03 +02:00
b93595c19f
Merge branch 'master' into 9/4/2015_master_to_dev
...
Conflicts:
code/game/jobs/job/security.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/colony-1.dmm
maps/colony-5.dmm
2015-09-04 08:43:37 -04:00
553ac01552
Autotraitor cleanup.
2015-09-04 20:17:47 +09:30
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
93a8a3a13f
Observers can now view radio settings, admins can alter them.
2015-09-04 10:07:41 +02:00
1f39768ce1
Vent crawling now explicitly checks for equipped items.
...
Fixes #10991 .
2015-09-04 08:09:05 +02:00
73f13d8084
Hairfix
2015-09-03 20:26:44 -04:00
4e360779ed
Guns, Coats, and Hair Oh My
...
Hair gender fix, the attack of the multicolor labcoats and hoodies, and
the addition of a new SMG E-Gun.
2015-09-03 19:51:26 -04:00
a41ce0bd93
Added the Resomi.
2015-09-04 08:57:03 +09:30
cae57f022e
Added by-species hat light overlays.
2015-09-04 08:56:45 +09:30
0a355c84a3
Added species checks for robolimb use.
2015-09-04 08:55:27 +09:30
94f7538d01
Merge pull request #10934 from PsiOmegaDelta/150822-Intercoms
...
Removes radio free range option, adds out-of range options
2015-09-03 20:47:39 +03:00
7bcf9aaea9
Merge pull request #10340 from comma/russian_roulette
...
Russian roulette and russian roulette accessories
2015-09-03 19:40:01 +02:00
72d768808a
Merge pull request #10110 from mwerezak/shields
...
Better shield handling
2015-09-03 20:38:48 +03:00
9728f28880
Merge pull request #10843 from PsiOmegaDelta/150924-CultSpeech
...
Relocates Cult/Occult languages to unused keys.
2015-09-03 20:37:16 +03:00
431db2bdbb
Merge pull request #10970 from Zuhayr/complexholder
...
Added a complex holder for human mobs + example icons
2015-09-03 20:36:17 +03:00
ad2e922776
Merge pull request #10971 from Zuhayr/sight
...
Added short-sightedness and sight flags proc.
2015-09-03 17:21:05 +02:00
e5aa095f09
Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.
2015-09-03 09:38:15 +02:00
00a05bbdaa
Remove a world.log print, change '0' to 'AUTOHISS_OFF' for clarity
2015-09-02 19:39:50 +01:00
9dca74f755
add list typing to maps and exemption list
2015-09-02 19:11:59 +01:00
f0b02d8035
Cleans up auto-hiss, makes declaring new auto-hiss strings a simple list declaration
2015-09-02 19:07:20 +01:00
593922929b
Changelog entry.
2015-09-02 16:54:54 +02:00
a7c527f491
Compilation fixes.
2015-09-02 15:14:24 +02:00
affff253bc
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/living.dm
code/modules/mob/mob_grab.dm
2015-09-02 14:58:13 +02:00
d78db0231b
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-02 14:42:27 +02:00
13780eba09
Rotates and otherwise cleans up map intercom usage.
2015-09-02 14:26:59 +02:00
1b23f794c5
Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms
2015-09-02 10:54:04 +02:00
2a02f4890c
Merge pull request #10336 from atlantiscze/phoronwindowsv2
...
Borosilicate windows
2015-09-02 16:11:39 +09:30
0f76c59944
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into technoir
...
Conflicts:
icons/mob/head.dmi
2015-09-02 04:50:00 +03:00
a3b3e52959
Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir
2015-09-02 04:38:26 +03:00
a6cdeee95c
Add autohiss/purr on a per-client toggle
2015-09-01 23:37:56 +01:00
6e2514d728
Beepsky should no longer attempt to arrest himself.
...
Adds additional threat check.
2015-09-01 18:25:51 +02:00
03f5254850
Restores suit rolling verb.
2015-09-01 13:50:38 +03:00
667debfb3c
Merge pull request #10745 from mwerezak/mob-grab
...
Cleans up mob_grab.dm
2015-09-01 12:58:50 +03:00
cf0a3f94d0
Merge pull request #10808 from Hubblenaut/dev
...
Bar drinks
2015-09-01 12:56:54 +03:00
28cf860332
Adds revolver spin sound.
2015-09-01 12:18:49 +03:00
1362271e60
Added short-sightedness for species, added groundwork for variant species sight flags.
2015-09-01 11:42:33 +09:30
bd76f977da
Added a complex holder for human mobs + example icons (for an unadded species)
2015-09-01 11:39:22 +09:30
3f6f34c16f
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/mob/holder.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
icons/mob/head.dmi
2015-09-01 11:22:10 +09:30
7581717246
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
maps/exodus-1.dmm
2015-09-01 10:55:19 +09:30
e0a70d24ba
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2
2015-09-01 03:22:08 +02:00
2d4c56a41e
Merge pull request #10940 from Zuhayr/dev
...
Limbs now copy hair data from their owner and may have optional body hair icons blended into them.
2015-08-31 20:57:40 +01:00
a7ff1a09ee
Adds Supply Fax
...
Quartermaster now has fax access and a fax machine. Fax machines have a
third admin channel, "Supply" for special requests like three thousand
mankinis or a Phazon, up to the admins to accept or deny requests, and
deduct cargo points if they'd like to.
2015-08-31 15:32:35 -04:00
7f97527471
Merge pull request #10581 from Kelenius/ofMechfabAndPanic
...
Updates mechfab
2015-08-31 17:39:04 +09:30
57ab846273
Merge branch 'dev' into ofMechfabAndPanic
...
Conflicts:
maps/exodus-1.dmm
2015-08-31 10:57:04 +03:00
9f54a71c2c
Limbs now copy hair data from their owner and may have optional body hair icons blended into them.
2015-08-31 16:34:13 +09:30
Zuhayr