Markolie
c89e3ac1eb
Revert "Revert "Emergency communications hotfix""
...
This reverts commit 3ea36839a8
2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
DZD
212ca5f5bd
MERGE CONFLIIIIIICTS
2015-02-19 20:26:36 -05:00
ZomgPonies
d54579850c
Revert "Saycode/language/species port from Bay"
2015-02-19 20:15:42 -05:00
DZD
d0d6c8eebd
Merge with upstream/master
...
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
ZomgPonies
043a5e0e31
Merge pull request #331 from Markolie/master
...
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
ZomgPonies
4be5819122
Merge pull request #339 from Fox-McCloud/Explosives
...
Chem Boom Nerf
2015-02-19 17:39:27 -05:00
Fox-McCloud
1812a36113
Chem Boom Nerf
2015-02-18 17:13:58 -05:00
DZD
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
Mark van Alphen
b407810e07
Merge pull request #324 from ZomgPonies/rev
...
New +MENTOR permission for mentors
2015-02-18 16:15:44 +01:00
Markolie
21926c9e48
Part 1 of saycode/language/species port from Bay
2015-02-17 23:20:50 +01:00
ZomgPonies
4f2ee19b11
Oops, good find Mark
2015-02-17 10:28:22 -05:00
ZomgPonies
c218a2457f
New +MENTOR permission for mentors
2015-02-17 02:28:00 -05:00
Markolie
ad167dc541
Announcement system overhaul, crew monitor system overhaul, add portable crew monitor
2015-02-16 19:03:29 +01:00
DZD
a4cda9287f
Merge with upstream/master
2015-02-12 16:43:01 -05:00
DZD
b3a0c9a975
Removes TABLEPASS and FPRINT flags
...
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Markolie
64fe9e8600
Remove legacy viewpoint code, move back to Bay's and /tg/'s system
2015-02-10 17:02:27 +01:00
Markolie
c507158b8f
Camera code update, fix runtime
2015-02-10 15:42:47 +01:00
Markolie
8fae0f029f
Accessory overhaul
2015-02-08 14:29:10 +01:00
Markolie
2a1e9931a6
Add shuttle stranding
2015-02-01 16:05:43 +01:00
Markolie
c520856716
Additional jobban options, minimum account age for antags
2015-01-31 19:48:48 +01:00
Markolie
5c18855967
Additional sight options for ghosts, makes AI eye visible to ghosts
2015-01-30 16:47:09 +01:00
Fox-McCloud
803f472085
Tweaking of Movement Speed
2015-01-16 15:28:03 -05:00
Fox-McCloud
159bf0f56c
Flashbang-Headsets
2015-01-13 16:33:49 -05:00
Markolie
ae54430e6a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
maps/cyberiad.dmm
2015-01-10 06:24:55 +01:00
Markolie
ced499edc3
Vox Heist port from Bay
2015-01-10 06:21:21 +01:00
Fox-McCloud
9f24f8efd6
Movement Speed
2015-01-09 22:26:21 -05:00
Fox-McCloud
ff2b7cedb2
Clothing Restructuring
2015-01-02 12:40:42 -05:00
Fox-McCloud
43af351d27
Odds and Ends
2015-01-01 21:05:50 -05:00
Markolie
266b4cb113
R&D UI rework
2014-12-22 17:38:22 +01:00
Fox-McCloud
84b9f05149
Xeno Tweaking
2014-12-16 20:26:27 -05:00
Markolie
e31886016b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/objects/structures/window.dm
2014-12-13 02:15:05 +01:00
Markolie
37b86cd8f1
Xenos gamemode rework
2014-12-13 02:08:22 +01:00
Fox-McCloud
fb14d3831e
Movement Speed Refactor
2014-12-12 10:17:53 -05:00
Fox-McCloud
e76c8f26f3
Stamina
2014-12-12 06:52:20 -05:00
Fox-McCloud
21a1c0bc83
Stunning Changes
2014-12-06 02:33:31 -05:00
Markolie
b21575f088
Bot port from /tg/
2014-12-02 17:59:40 +01:00
Markolie
3be1a2553e
Bug fixes, wording changes
2014-11-25 22:56:12 +01:00
Markolie
e9fc80fe7f
Re-add harmbatonning. Adds forcesay: if you're typing when you get hit by a stun weapon, you say a garbled version of what you were typing (from /tg/).
2014-11-22 20:22:28 +01:00
Markolie
42dd08ff7d
Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation
2014-11-22 02:24:21 +01:00
Markolie
0cd3223536
AI fixes, borg fixes, map fixes
2014-11-14 14:15:17 +01:00
Markolie
1494e9749e
Camera consistency fixes round two.
2014-11-08 16:16:30 +01:00
melandor0
59f73acfd3
Traitorstation Fixes + SyndieCat
...
Fixes some things with traitorstation and adds SyndieCat.
2014-09-02 13:53:11 +02:00
Bone White
c23a8d3513
Adds traitor station z level
...
also access via telescience with emag and z level set to 7
2014-08-28 14:58:17 +01:00
Zuhayr
c0ba021bcd
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
...
Conflicts:
code/datums/supplypacks.dm
code/game/machinery/hydroponics.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/reagents/reagent_containers/spray.dm
maps/tgstation2.dmm
2014-07-26 14:03:46 -04:00
Zuhayr
ebb9f724aa
Hydroponics rewrite, details will be in PR. Big commit.
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/game/gamemodes/events/spacevines.dm
code/game/machinery/seed_extractor.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/mob.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/food/snacks/grown.dm
icons/obj/hydroponics.dmi
maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
ZomgPonies
8fc1cc3024
Remove RadioChatter toggle as redundant and broken. Ghosts can use GhostRadio toggle while players can turn off their headsets ICly.
2014-07-24 16:35:22 -04:00
ZomgPonies
635fb6f7e2
Added empath as a spell along with action button
2014-07-18 13:26:58 -04:00
Rob Nelson
f7b516a5ab
Shit catches on fire now
...
Conflicts:
code/ZAS/Fire.dm
code/game/objects/items/weapons/storage/bible.dm
code/game/objects/items/weapons/storage/boxes.dm
code/modules/mob/living/living_defines.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photography.dm
code/setup.dm
2014-07-18 06:32:15 -04:00
Heredth
ded49a5af9
Update whisper.dm
...
Conflicts:
code/modules/mob/living/carbon/human/whisper.dm
2014-07-17 05:29:17 -04:00
