Remie Richards
ff8f62deb3
Merge pull request #12801 from KorPhaeron/KorPhaeron-patch-4
...
Monkey recycle fix
2015-11-01 20:28:49 +00:00
KorPhaeron
86b966e64f
Fix
2015-11-01 14:19:57 -06:00
Kyle Spier-Swenson
e7341d4384
Fixes shuttle docking ports being acted upon by the singulo
...
Fixes #12677
2015-11-01 12:03:50 -08:00
Xhuis
e291a05692
Adds the admin_override variable to Veil
2015-11-01 13:05:26 -05:00
Vincent
e4c307af79
You saw nothing
2015-11-01 11:40:14 -05:00
Vincent
8acfb8db3c
Grumble grumble doesn't work in new must be in initialize
2015-11-01 11:40:13 -05:00
Vincent
7bb3c14883
Error checking, consolidation, sql sanity
2015-11-01 11:40:13 -05:00
Vincent
c1d3ddb6e7
Adds database-fed random bookshelves.
2015-11-01 11:40:12 -05:00
Razharas
3951ccc3c3
Merge pull request #12771 from Jordie0608/totallyaspookyhalloweenchange
...
Removes ntsl investigate
2015-11-01 19:29:56 +03:00
xxalpha
9f4db8078b
Made it possible to paint windows to make them opaque.
...
Not tinted windows
Changed how painting and opacity work.
Clean timer
2015-11-01 16:26:54 +00:00
Razharas
0ad5714e5a
Merge pull request #12798 from KorPhaeron/KorPhaeron-patch-3
...
Xenobio cam hotfix
2015-11-01 19:06:06 +03:00
KorPhaeron
36d747acb6
Xenobio cam fix
2015-11-01 09:36:06 -06:00
Razharas
f618a4690b
Merge pull request #12752 from KorPhaeron/xenobiology2
...
Xenobiology Control Console
2015-11-01 18:30:34 +03:00
KorPhaeron
f58dcd9e5d
3 types
2015-11-01 09:08:15 -06:00
Razharas
8b22368202
Merge pull request #12678 from MMMiracles/asmartidea
...
Esword Embedding
2015-11-01 16:17:01 +03:00
Razharas
5ba4e04027
Merge pull request #12646 from Shadowlight213/OOCban
...
Adds the ability to ban someone from OOC
2015-11-01 15:43:55 +03:00
Razharas
8fc114e837
Merge pull request #12645 from Incoming5643/supermatter_sword
...
SUPERMATTER SWORD!
2015-11-01 15:43:06 +03:00
KorPhaeron
d26f642daf
Jobbans
2015-11-01 03:36:01 -06:00
kingofkosmos
e75d24a6c9
Changes checks in altclicks from canusetopic to incapacitated.
2015-11-01 11:24:17 +02:00
PKPenguin321
d2f3b0fd4a
fixes critical bugs
...
finishes -> finshes
arms -> arm
sorry for clogging commits :(
2015-11-01 01:23:14 -08:00
PKPenguin321
cb55c84c35
changes messages to be more clear
...
I forgot to change the messages to make them more clear, they were previously "checking for a chainsaw" since the way i checked for chainsaws was much more hacky in the original version of this code
2015-11-01 01:18:44 -08:00
PKPenguin321
a9cb60d690
adds removing chainsaws + indentation cleanup
...
changes indenting on chainsaw augmentation from a bunch of spaces to nice and neat tabs
adds a surgery to remove surgically attached chainsaws
2015-11-01 01:58:34 -07:00
Incoming
d08dc9a03d
Dark . wizardry and general clean up of years old code
2015-11-01 02:53:51 -05:00
KorPhaeron
8a9f2c70c8
Remove lizard
2015-11-01 01:45:03 -06:00
KorPhaeron
f45b34e73b
Cleaner code
2015-11-01 01:39:33 -06:00
PKPenguin321
63322f411b
fixes the logic
...
thanks xxalpha
i'd describe the change more in-depth but it's literally one line, hopefully you can figure out what i changed
2015-10-31 22:57:26 -07:00
Xhuis
3c20526900
Re-adds dethralling surgery and speeds up enthralling
2015-11-01 01:39:01 -04:00
Incoming
993052c9db
I've made a terrible mistake
2015-11-01 00:46:52 -04:00
Xhuis
7d2eb5ddf2
Changes spell sound mechanics
2015-10-31 23:27:27 -04:00
Cheridan
3e3aa2ee9f
Merge pull request #12748 from MrStonedOne/sweetsweetdimlight
...
[Pretty Pictures!] [map] Makes starlight have far spreading low levels of light rather than near spreading high levels of light.
2015-10-31 22:22:39 -05:00
KorPhaeron
5a781f93df
Merge remote-tracking branch 'refs/remotes/tgstation/master' into xenobiology2
2015-10-31 21:47:10 -05:00
Incoming
74f00a016d
Merge branch 'master' of https://github.com/tgstation/-tg-station into supermatter_sword
...
Conflicts:
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
icons/obj/weapons.dmi
2015-10-31 19:56:13 -04:00
Incoming
a9138e84c1
*Adds supermatter sword sprites
...
*Makes bullets that hit the supermatter sword get eaten
*Fixes some edge cases where a sword could eat itself
*Improves atmos handling
2015-10-31 19:48:24 -04:00
Razharas
9ee8d1c256
Merge pull request #12589 from Cheridan/5e
...
Upgrades Paladin to Fifth Edition
2015-11-01 02:09:01 +03:00
Razharas
122796dfb7
Merge pull request #12726 from MrPerson/delay_of_game_5_yard_penalty_repeat_first_down
...
Refactor mob movement delay calculation
2015-11-01 02:04:44 +03:00
KorPhaeron
8b2fec9281
Icons, monkey recycle
2015-10-31 17:56:29 -05:00
Cheridan
6d437a4d52
Merge pull request #12728 from GunHog/Hardsuits-are-cool
...
RAD/EMP/Bomb Hardsuit messages
2015-10-31 17:27:31 -05:00
AnturK
70222112f8
Makes mechs use some of pilot huds (job,wanted,loyalty,antag)
2015-10-31 23:02:50 +01:00
AnturK
331d8d9acd
Fixes one nuke kit per round.
2015-10-31 20:57:49 +01:00
AnturK
a7334f95b6
Adds POI List, makes orbit use it.
2015-10-31 20:02:06 +01:00
Razharas
590644c06e
Merge pull request #12686 from Firecage/jetpackobjective
...
Changes jetpack objective
2015-10-31 21:42:07 +03:00
Razharas
aa3198afd1
Merge pull request #12749 from GunHog/This-is-why-you-remember-to-SYNC!
...
Missing Diagnostic HUDs commit
2015-10-31 21:37:29 +03:00
Xhuis
4cb2ddc513
Removes shadowling talking in Chiller, fixes conflicts
2015-10-31 12:32:20 -04:00
Xhuis
2621397c41
Some fixes, makes shadowling speak in Chiller
2015-10-31 12:30:54 -04:00
GunHog
494de26abb
Magnitide -> Magnitude
2015-10-31 10:37:37 -05:00
Xhuis
55021fc27d
Conflicts 2/2
2015-10-31 11:32:12 -04:00
Xhuis
f2291a1194
Shadowling update 5
2015-10-31 11:30:29 -04:00
AnturK
d139f8c6ee
Mecha Speech Bubbles
2015-10-31 14:42:12 +01:00
Razharas
615275f71f
Merge pull request #12496 from kingofkosmos/interactivescreenalerts
...
More interactive screen alerts and workarounds for the resist-button
2015-10-31 15:13:15 +03:00
Razharas
75b5b4b362
Merge pull request #12751 from Incoming5643/ok_it_was_OP_I_admit_it
...
Lichmode lukewarm fix
2015-10-31 15:07:38 +03:00