fc46c2c145
Merge pull request #18884 from coiax/slower-shuttles
...
Changes default shuttle transit time to 15 seconds
2016-06-25 14:51:56 -04:00
591763e4e3
Merge pull request #18882 from coiax/qdelin
...
Adds QDEL_IN(time) macro; more spawn() removal
2016-06-25 14:44:26 -04:00
df5afefc4d
Merge pull request #18883 from coiax/domination-time
...
Gang domination now uses world.time
2016-06-25 14:43:40 -04:00
44ff3f3bca
Merge pull request #18887 from coiax/cleaning-1
...
Code cleaning; countdown for transformer
2016-06-25 14:43:26 -04:00
f34cc67333
Merge branch 'master' into qdelin
...
Conflicts:
code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
2016-06-25 19:29:46 +01:00
c08a38c271
Fixes drake fireballs becoming invisible ( #18913 )
...
* Fixes drake fireballs becoming invisible
* how do I successfully code anything
it's probably the constant self-review
2016-06-25 12:11:17 -04:00
a1684508e5
Fixing dragons
2016-06-25 12:44:08 +01:00
0ec6f9d8a3
Code review
2016-06-25 11:57:09 +01:00
df9bd80c03
More spawn() removal and timers and stuff
2016-06-25 11:55:21 +01:00
958b7bfc82
Makes things use QDEL_IN
2016-06-25 11:53:31 +01:00
177dcbe16b
Bug fixes
2016-06-25 11:40:09 +01:00
87016bc6cd
Code cleaning; countdown for transformer
...
🆑 coiax
rscadd: Observers now have a visible countdown for borg factories,
silicons can examine the factory to determine how long it has remaining
until it is ready.
/🆑
- Removes a bunch of spawns and trailing returns
2016-06-25 11:40:03 +01:00
a90a23134d
Merge pull request #18876 from ChangelingRain/stablemine
...
Stabilizing Serum is named properly in the mining vendor
2016-06-25 17:34:43 +12:00
9427c39155
Merge pull request #18872 from ChangelingRain/poolorgib
...
Pools several unpooled overlay/temp objects
2016-06-25 17:34:30 +12:00
22e370b8b7
Merge pull request #18866 from Jordie0608/idkwhythiswasntathingalreadyicanthinkofareasonwhynot
...
Adds edit to job tempbans
2016-06-24 13:26:38 -05:00
cf437557e3
Merge pull request #18865 from ChangelingRain/stunborg
...
Flashes now once again stun borgs
2016-06-24 13:01:46 -05:00
b6a715a366
Merge pull request #18862 from MrPerson/reminder_to_vote_in_brexit_britfags
...
Fixes mechs breaking lights by walking onto them
2016-06-24 11:57:45 +02:00
e1b7ef1cba
Changes default shuttle transit time to 15 seconds
...
🆑 coiax
rscdel: The default shuttle transit time is now
15 seconds.
/🆑
- Fixes shuttle movement spam to spam stun
- Guarantees that all shuttles produce the full
ten second ripple effect before appearing
2016-06-24 10:16:27 +01:00
2e093a54dd
Compile errors II
2016-06-24 09:59:12 +01:00
276316e100
[dnm] Gang domination now uses world.time
...
🆑 coiax
tweak: Gang domination now uses real time rather than game time, making
that 900 seconds an ACTUAL 900 seconds, like shuttle timers.
/🆑
I am currently unable to test this, if someone could that would be
great.
2016-06-24 09:40:51 +01:00
2782f7fdfa
Merge pull request #18836 from SnipeDragon/master
...
Mice now retain custom names on death. ( Issue #18786 )
2016-06-24 20:15:32 +12:00
41e3acc71d
Merge pull request #18820 from Xhuis/the_pinnacle_of_deception_technology
...
Adds cardboard cutouts
2016-06-24 20:14:59 +12:00
04da1c08b3
Fixed for custom placed mice.
2016-06-23 23:24:03 -05:00
b374e26b91
Stabilizing Serum is named properly in the mining vendor
2016-06-23 22:58:18 -04:00
b13d7f86af
Pools several unpooled overlay/temp objects
2016-06-23 20:50:36 -04:00
91a7632d9d
no module unequip
2016-06-23 20:00:58 -04:00
8183eb1e9f
Merge pull request #18847 from Shadowlight213/botclosefix
...
Fixes bot interfaces reopening for all previous users.
2016-06-24 10:07:49 +12:00
ca5a7f50c7
Merge pull request #18837 from SnipeDragon/dev2
...
Guest keys no longer trigger findJoinDate (Fixes #18749 )
2016-06-24 09:34:25 +12:00
40f68a409f
fixes magnet ( #18867 )
2016-06-23 11:52:52 -04:00
92305ddb62
adds edit to job tempbans
2016-06-23 23:23:27 +10:00
d0d6e8d6f7
Flashes now once again stun borgs
2016-06-23 08:52:11 -04:00
df637898ef
Fixes mechs breaking lights by walking onto them
...
Fixes #17271
2016-06-23 02:51:55 -07:00
ddaeb722ca
Merge pull request #18810 from coiax/vital-changes
...
Butterflies and cats
2016-06-23 15:07:06 +12:00
e6efbdf88f
Cogscarab storage is no longer painted cardboard ( #18821 )
2016-06-22 18:48:36 -05:00
dc7c591748
Code review
2016-06-23 00:40:28 +01:00
5f9553163c
Butterflies and cats
...
- Butterflies now "flutter" rather than say
- Admins have gained Admin->Secrets->Fun->Mass Purrbation
- Plus new cat sound effect.
2016-06-23 00:37:15 +01:00
8b29e3e049
Merge pull request #18677 from coiax/cellular-emporium
...
Changling evolution menu becomes cellular emporium
2016-06-23 10:06:51 +12:00
81da43bdc5
Merge pull request #18790 from tgstation/RemieRichards-disappointed
...
Venus human trap changes
2016-06-23 10:05:39 +12:00
b622d10ecb
Fixes three problems of my own identification/invention ( #18824 )
...
* Fixes three problems of my own identification/invention
1. Fixes meaty ores spawning with invisible "snack" meats
2. Fixes easyattachment limbs remaining in your hand sometimes
3. Mirrors the fix of all ghost role sleepers being exclusively male from my other, less mergable pr.
* I failed a spot check
2016-06-22 17:03:09 -05:00
0432cd9bb4
Merge pull request #18484 from coiax/random-space
...
All of space is now randomised
2016-06-23 09:12:48 +12:00
e72b96b4d1
Fixes bots not removing a user from the users list on closing the interface.
2016-06-22 12:24:21 -07:00
a6fc773540
Merge pull request #18723 from coiax/pond-skipping
...
Adds visible ripples indicating shuttle's transit
2016-06-22 11:24:44 -05:00
ef2bb16777
findJoinDate only procs if a client is not a Guest and the DB is connected. As Jordie requested.
2016-06-22 06:33:32 -05:00
8bdf81ff84
Guest keys no longer trigger findJoinDate ( Fixes #18749 )
2016-06-22 06:00:21 -05:00
4e6402e3fb
Coding standards fix.
2016-06-22 05:07:40 -05:00
2f858d7426
Merge branch 'master' of github.com:SnipeDragon/tgstation
2016-06-22 04:45:59 -05:00
f2ee254096
Consistency fix for Issue #18786
2016-06-22 04:43:05 -05:00
d950565a3f
Make Staff of Honkmother slightly less OP ( #18802 )
...
Just reducing the stun on it a smidgen so it doesn't stun like a rapid fire stun gun.
2016-06-22 03:23:05 -05:00
7ab8f8772f
Merge pull request #18794 from KorPhaeron/durkel
...
Adds missing return to boss loot
2016-06-21 23:13:49 -05:00
dbf467136f
Merge pull request #18830 from MMMiracles/a_skele-ton
...
Fixes Invisible Skeletons
2016-06-21 23:10:56 -05:00
Joan Lung
Jack Edge
oranges
Cheridan
AnturK
SnipeDragon
bawhoppen
Jordie
MrPerson
Incoming5643
Shadowlight213
Faltnor