MrStonedOne
e21ed011af
Fixes some erros in the database system
...
Replaces erro_ with a configurable table prefix system
Defaults to erro_ if not configured, but configuation files default to SS13_
2014-09-19 13:37:58 -07:00
Cheridan
2fb2e902dc
Merge pull request #4726 from Miauw62/sensualwhispers
...
Adds a separate preference for whispers.
2014-09-16 12:42:13 -05:00
Cheridan
351a51626b
Merge pull request #4840 from Ikarrus/allnukecode
...
All Nuke Ops are told the code when spawned
2014-09-16 12:07:27 -05:00
Cheridan
de6edfc1c6
Merge pull request #4818 from Incoming5643/summoneventfixerspecial
...
Magic Mania 1.75 Appendix A: lets get comparitively reasonable
2014-09-16 09:09:40 -05:00
Cheridan
98ca6f551a
Merge pull request #4715 from Firecage/STATUESGALORRE
...
Mineral Statues!
2014-09-16 08:56:40 -05:00
Cheridan
cd990bdeda
Merge pull request #4810 from phil235/Messagetypos
...
Fix many messages and sounds
2014-09-16 08:45:31 -05:00
Cheridan
1ac119c2ee
Merge pull request #4839 from Aranclanos/infraredsensors
...
Fixes some runtimes from the infrared sensors.
2014-09-16 08:39:12 -05:00
Alex
9673532613
Merge pull request #4796 from Perakp/ghostbag
...
Ghosts don't trigger mousetraps.
2014-09-16 12:18:04 +01:00
Alex
171a1b9cd0
Merge pull request #4829 from Ikarrus/gspeakfix
...
Fixes Respec exploit with hivemind chat
2014-09-16 12:16:28 +01:00
Alex
0d7ec7f71c
Merge pull request #4831 from Ikarrus/cardcompfix
...
Identification Console Update
2014-09-16 12:12:45 +01:00
Alex
5187ad81c4
Merge pull request #4819 from Aranclanos/extinguishfix
...
Fixes humans extinguishing themselves when they are in a turf with no oxygen.
2014-09-16 12:12:17 +01:00
Alex
6a083ecda0
Merge pull request #4835 from Aranclanos/Entered
...
Entered() cleanup
2014-09-16 12:12:04 +01:00
Cheridan
d3e7e1b73d
Merge pull request #4821 from phil235/FlashbangFix
...
Fix for #3773
2014-09-15 21:27:15 -05:00
Cheridan
ce2b8c4306
Merge pull request #4739 from Jordie0608/theiconstatenamesforturretsarelamewhocameupwiththem
...
[MAP] Replaces area turrets with porta turrets
2014-09-15 21:18:29 -05:00
ikarrus
64000f2c8e
Increases chance to hear hivemind to 30%
2014-09-15 19:08:28 -06:00
Incoming
071f9bff0a
Fixes up some silly problems with cursed items:
...
Things won't be called cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed foo's anymore
Cursed Katanas can't get stuck in any other slots now
Things that destroy your ability to go into space now won't spawn on you at all if you happen to be in space when the spawning occurers, but hey don't idle in space just to avoid a luchador mask, magicarp are still a thing.
2014-09-15 19:22:25 -04:00
Cheridan
6587b56a7c
Merge pull request #4765 from JJRcop/magicarp-random
...
Creates new "chaos magicarp" that fires a random projectile each time
2014-09-15 10:22:50 -05:00
ikarrus
8f82644d0f
All Nuke Ops are told the code when spawned
...
So they don't have to rely on some sheet of paper.
2014-09-15 09:18:12 -06:00
Cheridan
31b2043de6
Merge pull request #4743 from Iamgoofball/patch-4
...
Department Revolt: More potential names
2014-09-15 09:46:17 -05:00
Aranclanos
d15b9efe71
Removes some commented out code and some debug messages leftlovers from my previous commit.
2014-09-15 10:03:14 -03:00
Aranclanos
5ddaf77774
Fixes some runtimes from the infrared sensors, removed a lot of useless spawn()
2014-09-15 09:45:56 -03:00
Alex
57950abcf7
Merge pull request #4794 from Aranclanos/RnDfloral
...
The RnD console won't break anymore when the floral gun is possible to build.
2014-09-15 11:46:33 +01:00
Firecage
caa4d60503
Phase Honk
2014-09-15 12:44:52 +02:00
Firecage
16502db223
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into STATUESGALORRE
2014-09-15 11:17:44 +02:00
Firecage
ad5d15a225
New part
2014-09-15 11:16:39 +02:00
Aranclanos
53f48fa599
Cleaned up the turf Entered() procs:
...
-Removed check for infrared beams. (it checked each time that anything moved)
-Removed 'movement_disabled' check, the verb is also completely removed.
For space Entered() turfs:
-Removed check for meteor
Now meteors and immovable rods will use the same proc to determinate their start and finish, while moving they'll check in which z level they are, deleting themselves if they leave it.
-Removed spawn() to move objects being pulled between z levels
Replaced the step() from mob pulling movement code and replaced them with Move()
For asteroid Entered turfs:
-Removed check for mining cyborgs, now it will be next to the janitor borg check to clean the floor.
Mecha code got a small clean, removing the Entered() calls from there.
2014-09-15 03:26:58 -03:00
Jordie0608
c2e664fa23
Merge branch 'master' of https://github.com/tgstation/-tg-station into theiconstatenamesforturretsarelamewhocameupwiththem
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-09-15 13:36:07 +10:00
Jordie0608
14cbabdb96
Merge fix (hopefully)
2014-09-15 12:56:56 +10:00
JJRcop
97a65cfb04
Changes Shoot() in magicarp to be forwards compatible
2014-09-14 16:07:54 -04:00
ikarrus
e8e1814a32
Identification Console Update
...
- You can enter "Head of Security" as a custom title without it auto-correcting to "Head Of Security" and messing up job title identification
- Added an "Unassigned" option to the list of jobs. It strips all access from the card.
2014-09-14 13:23:22 -06:00
ikarrus
bb00461506
Fixes Respec exploit with hivemind chat
2014-09-14 12:29:01 -06:00
Perakp
f637e6491c
Unconscious don't trigger mousetraps.
2014-09-14 20:49:36 +03:00
Cheridan
2fad308f38
Merge pull request #4747 from Incoming5643/wandfireball
...
Magic Mania√π: Adds the missing wand of fireball to summon magic
2014-09-14 11:21:20 -05:00
phil235
e639737605
hearers() -> get_hear() Fixing the issue.
2014-09-14 15:35:23 +02:00
Alex
6697b18f7a
Merge pull request #4770 from Donkie/glassfix
...
Fixed welding a shard producing message spam
2014-09-14 13:20:24 +01:00
phil235
4d427bf712
Partial fix for the immunity to flashbangs in the dark ( now only immune if in the dark AND inside a locker). Deaf people no longer see the "BANG" message of flashbangs.
2014-09-14 14:19:25 +02:00
Alex
3bf763f9a7
Merge pull request #4792 from Aranclanos/grabruntimes
...
Fixes two runtimes related to the grab object.
2014-09-14 13:19:04 +01:00
Alex
37b4c6bdfa
Merge pull request #4793 from Aranclanos/falsewalldismantle
...
Fixes the dismantling falsewalls with plasmacutters, diamond drills and energy blades.
2014-09-14 13:16:16 +01:00
Alex
4c919969a8
Merge pull request #4773 from Donkie/jobnote
...
Added note of what occupation the guy had at endround stats
2014-09-14 13:16:06 +01:00
Alex
c504cdc46b
Merge pull request #4766 from Cheridan/cult_spam
...
Horrible Cult Spam Fix
2014-09-14 13:15:14 +01:00
Alex
ad0d98a1c0
Merge pull request #4750 from Aranclanos/processloop
...
Better loops for all the process tickers of the master controller.
2014-09-14 13:14:53 +01:00
Alex
1431e64477
Merge pull request #4781 from Jordie0608/niknaksaystickymayhemisnotprofessionalyethetalksaboutpooping
...
Removes log_adminwarn
2014-09-14 13:14:22 +01:00
Alex
ba80b64191
Merge pull request #4798 from Lo6a4evskiy/AIfixer-fix
...
AI restoration console shows ion laws
2014-09-14 13:14:09 +01:00
Alex
01b9f2c851
Merge pull request #4800 from rbreslow/patch-1
...
Fix span error
2014-09-14 13:13:22 +01:00
Alex
43ff5a56fe
Merge pull request #4814 from Ikarrus/handholdingspoonfeeding
...
Shuttle Call/Recall Tracing in Announcements
2014-09-14 13:13:11 +01:00
Alex
09dffeb90b
Merge pull request #4807 from Miauw62/vOv
...
Fixes ghosts not being able to hear binary.
2014-09-14 13:09:35 +01:00
Alex
d8b87f029b
Merge pull request #4808 from Miauw62/stuff
...
Prevents an extreme edge case where fresh clones could talk.
2014-09-14 13:09:22 +01:00
Alex
1523110bf5
Merge pull request #4784 from Aranclanos/Nukediskinfo
...
Nuke disk deletion asay extra info
2014-09-14 13:09:11 +01:00
Alex
22ea010752
Merge pull request #4787 from Aranclanos/sleeperschems
...
Sleeper chems
2014-09-14 13:08:58 +01:00
Alex
a3ba933515
Merge pull request #4799 from phil235/MachineryFix
...
Multiple machinery fixes
2014-09-14 13:08:30 +01:00