Commit Graph

11618 Commits

Author SHA1 Message Date
YotaXP
2ffc5f055c Fixed bad origin_tech values. 2015-11-05 15:32:25 -05:00
Razharas
4b9e7e4f35 Merge pull request #12847 from Shadowlight213/dsaylogging
Reworks asay and dsay logging so they can be easily identified
2015-11-05 21:16:32 +03:00
Cheridan
6555156399 Merge pull request #12812 from KorPhaeron/lasertag
Makes lasertag projectiles beams
2015-11-05 08:15:58 -06:00
Razharas
ed68f0bd1e Merge pull request #12813 from KorPhaeron/xenobio_fixes
Xenobio console fixes
2015-11-04 23:42:09 +03:00
Razharas
8ab8fa3767 Merge pull request #12819 from Incoming5643/slime_time_live
Little QoL thing for slimeperson splitting
2015-11-04 23:40:26 +03:00
Cheridan
55e138c77d Merge pull request #12817 from Incoming5643/so_long_dental_plan
Dental implant fixes
2015-11-04 11:28:30 -06: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
Shadowlight213
ef8598e7d1 Changes asay and dsay logging so they are seperate logging types. 2015-11-03 20:07:55 -08:00
Cheridan
064bff0edc Merge pull request #12826 from GunHog/WJs-How-To-Fix-Your-Xeno
Simple Animal Xeno Hunter Sprite Fix
2015-11-03 19:05:56 -06:00
Razharas
9df2bf8a45 Merge pull request #12750 from SuperSayu/auto_librarian
Adds database-fed random bookshelves.
2015-11-03 04:25:03 +03:00
Razharas
cd1454a71c Merge pull request #12794 from kingofkosmos/altclickcheckfix
Alt+click checks fix
2015-11-03 04:19:38 +03:00
GunHog
eed3116d43 Simple Animal Xeno Hunter Sprite Fix
- Fixes icon_state for simple mob alien hunter.
2015-11-02 19:19:33 -06:00
Razharas
46f17fecf5 Merge pull request #12802 from MrStonedOne/patch-58
Fixes shuttle docking ports being acted upon or pulled by the singulo
2015-11-03 02:19:47 +03:00
xxalpha
c313bd2c46 Fixed buckled, handcuffed and legcuffed alert buttons not calling resist. 2015-11-02 18:57:52 +00:00
Incoming5643
c8b1fe81b5 I really need to stop coding at 3 am 2015-11-02 03:24:47 -05:00
Incoming
9ffa8ed82c Merge branch 'slime_time_live' of https://github.com/Incoming5643/-tg-station into slime_time_live 2015-11-02 03:08:39 -05:00
Incoming
5020846729 Shifting between bodies can't be done while unconscious, so this keeps slimepeople from jumping to already unconscious bodies so no one gets blindly trapped 2015-11-02 03:07:39 -05:00
KorPhaeron
e60d0f9203 Fix for jordie 2015-11-02 00:43:33 -06:00
Incoming
30e8a39869 Checks work better when you actually check them.
Adds some low level logging for implanted pill use. If you want specific logging for when certain chemicals come into play, that's more a goofchem problem.

Fixes some grammer while I'm here
2015-11-02 01:12:48 -05:00
KorPhaeron
e5f59edfae Xenobio fixes 2015-11-01 21:05:06 -06:00
KorPhaeron
015c480e8f Lasertag beams 2015-11-01 20:55:46 -06:00
Razharas
282dae922e Merge pull request #12762 from GunHog/Of-Scanners-And-Bugfixes
Research scanner fixes
2015-11-01 23:32:34 +03:00
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
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
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
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
kingofkosmos
e75d24a6c9 Changes checks in altclicks from canusetopic to incapacitated. 2015-11-01 11:24:17 +02: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
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
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
GunHog
494de26abb Magnitide -> Magnitude 2015-10-31 10:37:37 -05: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
Razharas
381f3bb8ad Merge pull request #12718 from Incoming5643/so_long_dental_plan
Adds dental implant surgery
2015-10-31 15:05:28 +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
Jordie
3e8a47b40d Merge pull request #12746 from Incoming5643/slime_time_live
Fixes an errant sanity check in slimeperson splitting
2015-10-31 18:52:53 +11:00
Jordie
909c04e2a0 Merge pull request #12744 from Shadowlight213/awayconfig
Moves away mission map selector to config folder and fixes stool paths in away missions.
2015-10-31 18:52:37 +11:00
Jordie
5670780cac removes ntsl investigate 2015-10-31 15:06:49 +11:00
Razharas
f78289c60e Merge pull request #12716 from GunHog/Charge-ALL-The-Guns!
Buildable Rechargers!
2015-10-31 05:10:04 +03:00