Commit Graph

12007 Commits

Author SHA1 Message Date
Razharas 0a99df38ed Merge pull request #12295 from AnturK/weregoats
Shapeshift Spell
2015-11-04 17:10:27 +03:00
AnturK d977085883 Proper category for shapeshift 2015-11-04 12:54:24 +01:00
Cheridan fb3bbbee9c Merge pull request #12825 from xxalpha/resist
Fixed cyborgs not being able to unbuckle with alarm button
2015-11-03 23:05:59 -06:00
Razharas cd1454a71c Merge pull request #12794 from kingofkosmos/altclickcheckfix
Alt+click checks fix
2015-11-03 04:19:38 +03:00
Cheridan ea42f2d43f Merge pull request #12780 from AnturK/nukekitfix
Fixes one nuke kit per round.
2015-11-02 19:15:59 -06:00
xxalpha c313bd2c46 Fixed buckled, handcuffed and legcuffed alert buttons not calling resist. 2015-11-02 18:57:52 +00:00
Remie Richards 4754ffd770 Merge pull request #12788 from Incoming5643/80_win_rate
Unbreaks Rev
2015-11-02 05:05:08 +00:00
AnturK 150c25b810 Shapeshift Spell 2015-11-02 00:28:58 +01:00
KorPhaeron 47d1d57a69 Removes spam 2015-11-01 17:04:49 -06:00
Razharas 3cd68567ab Merge pull request #12754 from KorPhaeron/headsets
Adds normal captains headset to captains locker
2015-11-02 01:35:25 +03:00
Remie Richards 046948f314 Merge pull request #12630 from KorPhaeron/Reflector
Laser Reflector Structure
2015-11-01 21:46:29 +00:00
KorPhaeron 99cc8aca9a Proper istype 2015-11-01 15:36:28 -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
kingofkosmos e75d24a6c9 Changes checks in altclicks from canusetopic to incapacitated. 2015-11-01 11:24:17 +02:00
Incoming d08dc9a03d Dark . wizardry and general clean up of years old code 2015-11-01 02:53:51 -05:00
KorPhaeron f45b34e73b Cleaner code 2015-11-01 01:39:33 -06:00
Incoming 993052c9db I've made a terrible mistake 2015-11-01 00:46:52 -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
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 331d8d9acd Fixes one nuke kit per round. 2015-10-31 20:57:49 +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
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 1e3aa40015 Merge pull request #12714 from MrPerson/lastarea's_last_ride
Removes the unused lastarea mob var
2015-10-31 15:05:40 +03:00
MrStonedOne 8c755da84f Adds a way to make certain area/space areas not force 100% brightness 2015-10-31 02:30:49 -07:00
MrStonedOne ee4d24130e Bumps starlight down one notch 2015-10-30 21:30:21 -07:00
Razharas 1151d09a5f Merge pull request #12724 from Incoming5643/80_win_rate
Lack of security now impacts head rev scaling
2015-10-31 05:10:35 +03:00
Razharas f78289c60e Merge pull request #12716 from GunHog/Charge-ALL-The-Guns!
Buildable Rechargers!
2015-10-31 05:10:04 +03:00
Razharas 8f8daae3f3 Merge pull request #12715 from AnturK/oneturrettorulethemall
Removes deprecated area turret code
2015-10-30 15:21:07 +03:00
KorPhaeron 354a03ea37 Headset 2015-10-30 05:30:42 -05:00
KorPhaeron d87803fdb4 Slime blueprints 2015-10-30 04:42:20 -05:00
GunHog 336b57bd5a Missing Diagnostic HUDs commit
For some reason, the final commit for DiagHUDs was lost. This adds
Diagnostic HUDs to roboticist lockers, the protolathe properly, fixes
the night HUD's onmob sprite and adds a quick changelog.
2015-10-30 00:45:31 -05:00
MrStonedOne 03ff22fbbc Adds the ability to set a light source's high end
Makes starlight use new system to have far spreading low levels of light rather then near spreading high levels of light.
2015-10-29 22:31:08 -07:00
Razharas fc0ea9311b Merge pull request #12614 from GunHog/Diag_Huds
Diagnostic HUDs
2015-10-30 06:25:48 +03:00
GunHog f0f16426b9 Gold requirement
- Circuit board design now requires gold.
- Origin and Required tech levels made consistent with a board that
takes gold.
2015-10-29 08:20:32 -05:00
GunHog faf315328a Fixes
Uses show_message() so blindness is respected.
Touches up the messages themselves a little.
2015-10-29 08:05:32 -05:00
Incoming c909ac6ffe The lack of security is now taken into account in revolution head rev scaling.
See the pull request for technical details.
2015-10-29 00:10:18 -04:00
Jordie a09d69e985 Merge pull request #12330 from feemjmeem/tanksuicide-refactor
re-enable tank suicide, but retain body and all objects
2015-10-29 14:27:37 +11:00
Cheridan 62527884ed Merge pull request #12702 from optimumtact/pkpenguin
Adds a surgery to attach a chainsaw to your hand
2015-10-28 18:08:36 -05:00
Cheridan f00b6101e7 Merge pull request #12698 from Firecage/youcandoitlilmonkey
Allows monkeys to use ointments and brute packs.
2015-10-28 17:51:56 -05:00
AnturK 6a00a9768c Removes area turrets 2015-10-28 23:15:44 +01:00
Cheridan 89f8b0eea5 Merge pull request #12697 from KorPhaeron/biobag
Moves biobags under biosuits
2015-10-28 16:37:19 -05:00