Chinsky
48c35d0f8f
Merge pull request #3938 from Ccomp5950/master
...
Admin request: Jobbans for IA and ERT
2013-11-20 10:27:36 -08:00
Ccomp5950
457835db38
Admin request: Jobbans for IA and ERT
2013-11-17 18:16:42 -06:00
DJSnapshot
9936a9251f
Helps to add the actual new file.
2013-11-17 11:55:57 -08:00
DJSnapshot
b75380985e
Using a better method to handle autotransfers. Old method was silly.
2013-11-17 11:54:43 -08:00
Mloc
10cb810464
Merge pull request #3925 from Nanai/master
...
Event Rebalance!
2013-11-16 09:58:59 -08:00
Nanai
ab06251c32
Event Rebalance!
...
As per request, events have been rebalanced to be a bit more even and vastly less appendicitis. Event timers have been increased from 15-25 minutes to 20-40 minutes.
2013-11-16 02:09:28 -05:00
Ccomp5950
4ccf7d0a08
Bugfix (3778) Power cells in exosuits have the same amount of power as a highcap cell
...
Issue: Mechs are created/spawned with a high-capaciter cell that is named "Power cell" and confuses some of the less bright roboticists and their beards.
Solution: Shave the roboticist, and also renamed the cell that spawns to properly reflect it's higher capacity.
2013-11-15 22:07:08 -06:00
Chinsky
3aa7f498b3
Merge pull request #3920 from Kilakk/master
...
Fixes #3886 , ATMs no longer log you in automagically
2013-11-15 01:55:29 -08:00
Ccomp5950
734d89c669
BugFix: Cult Ghosts...after a bit of professional advise from chinsky.
...
Problem: Cult members can't use the rune to see ghosts, then beat ghosts over the head. it was being intercepted by _onclick and processed there and only displaying an angry red notice
that you hit that ghost. Ghost didn't become visible, it disappeared soon after moving off the rune.
Solution: Made an attackby for ghosts to check when they are being beat up by cultist with books, now they appear.
Minor feature change: Now if a visible ghost gets hit it will give a different message than the standard "Ghost is pulled through from the other side".
2013-11-15 01:00:25 -06:00
Kilakk
99321389f2
Fixes #3886 , ATMs no longer log you in automagically
...
Silly security level 0 ruined everything
Added a tiny sanity check as well to avoid runtimes
2013-11-14 21:45:25 -05:00
Mloc
955d6d9067
Merge pull request #3909 from comma/master
...
No nullname ID cards
2013-11-13 14:08:18 -08:00
Chinsky
8696d4fbd9
No nullname ID cards
2013-11-12 02:10:01 +03:00
LightningIron
b5671e8bd8
Surgery grammar fixes
2013-11-10 13:08:44 -06:00
Mloc
6f19999a9c
Merge pull request #3897 from comma/organstuff
...
Minor organ optimizations
2013-11-08 05:44:24 -08:00
Chinsky
d1be0cba0b
Healing wounds should properly update damage overlay if needed.
2013-11-08 08:10:50 +04:00
Chinsky
3992888ea6
removed some unneeded icon update calls (haha totally unneeded yeah)
...
replaced complete regenerate_icons with just body_update in case of dropping limb
2013-11-08 04:34:37 +04:00
Chinsky
04237f47cb
Merge pull request #3894 from DJSnapshot/master
...
Fix for fire alarms in Mining and Research Outpost
2013-11-07 16:27:38 -08:00
Chinsky
6d369caae7
Replaces long check with lots of get_organ calls with shorter one.
...
Also changed weird condition that amputated leg must not be splinted.
Removed checks for haslimbs, since movement while downed is not possible anyway.
Moved some special effects for broken limbs after check for such, so healthy ones wont bother.
Fixed a derp in populating the global list of sideffects.
2013-11-08 04:15:49 +04:00
DJSnapshot
7c59c41b13
Fix for fire alarms in Mining and Research outpost so they actually will change status depending on the alert level of the station.
2013-11-07 16:02:57 -08:00
Kilakk
ee34d281f9
Fixes #3890 , gave Aloe a more reasonable boozepwr
2013-11-07 18:54:42 -05:00
Chinsky
8b89b54233
Caches side effect types to a global list, less loops on addition.
...
Makes them process only every 15 ticks, to cut down on the calls.
Removes damage because it was supposed to be gone, no idea why I didn't delete the lines.
2013-11-08 03:18:25 +04:00
Chinsky
a90888b851
Missed last debug line
2013-11-08 02:10:20 +04:00
Mloc
96ebb4edc8
Merge pull request #3889 from zekesulastin/genetics-beaker
...
Fixes duplicate beaker on Eject Occupant
2013-11-07 02:48:49 -08:00
ZekeSulastin
4dae789cb5
Fixes duplicate beaker on Eject Occupant
2013-11-06 19:37:56 -05:00
Chinsky
1f110d5a74
Merge pull request #3885 from DJSnapshot/master
...
Cleanbot now cleans mucus
2013-11-05 23:34:44 -08:00
DJSnapshot
3aa8d088bd
cleanbot now cleans mucus
2013-11-05 22:24:02 -08:00
Mloc
d228089601
Merge pull request #3880 from comma/master
...
Where can I get my idiot certificate.
2013-11-04 16:05:07 -08:00
Chinsky
b7edb181ed
Where can I get my idiot certificate.
2013-11-05 03:59:39 +04:00
Mloc
2eb98fd86e
Merge pull request #3879 from comma/master
...
derp
2013-11-04 15:18:50 -08:00
Chinsky
5df1b3c0d4
derp
2013-11-05 03:17:44 +04:00
Mloc
68f796b572
Merge pull request #3874 from comma/master
...
Some virus fixes
2013-11-04 13:15:40 -08:00
Chinsky
40e862fe00
GC's virus dummies #whoa #derp
2013-11-05 01:13:49 +04:00
DJSnapshot
c20c84b328
Dun goofed
2013-11-04 13:10:33 -08:00
Chinsky
3a425c6095
Another uncommented log debug line.
2013-11-05 01:08:31 +04:00
DJSnapshot
15a2bcc54f
Fix so bans can work again.
2013-11-04 13:07:03 -08:00
Mloc
86ebf818f1
Merge pull request #3872 from comma/master
...
Goasts & Spam
2013-11-04 10:49:07 -08:00
Chinsky
9c6a51b3fb
Commens out debuglog spam in side effects
2013-11-04 22:38:55 +04:00
Chinsky
98ba7e4699
Fixes zombie goast tableflips
2013-11-04 22:36:22 +04:00
Chinsky
6152644155
Merge pull request #3868 from DJSnapshot/master
...
Devs are speshul snoflakes too.
2013-11-03 19:19:36 -08:00
DJSnapshot
6ef89ef868
Devs are speshul snoflakes too.
2013-11-03 19:18:33 -08:00
Chinsky
8c69e3d8b7
derp
2013-11-04 05:53:10 +04:00
Mloc
7fdcf3deee
Merge pull request #3866 from comma/master
...
Itty bitty antilag bits.
2013-11-03 17:21:20 -08:00
Chinsky
6402581595
Itty bitty antilag bits.
...
-If wound disappears, do not process it.
-Moved reagents checks so they are only done when wound is internal. They have no effects on non-internal wounds anyway.
-Calling update_body only when losing limbs, other times UpdateDamageIcon(] is right proc
2013-11-04 05:16:04 +04:00
DJSnapshot
231131c1f5
Merge pull request #3814 from Baystation12/dev-freeze
...
0.1.5 merge.
2013-11-03 14:02:16 -08:00
Mloc
64ca8fb853
Merge pull request #3865 from DJSnapshot/master
...
Fixed delay so anyone with R_SERVER can use it.
2013-11-03 13:33:05 -08:00
DJSnapshot
11f0b1ef92
Fixed delay so anyone with R_SERVER can use it.
2013-11-03 13:31:54 -08:00
Mloc
ad9139304d
Merge pull request #3864 from comma/master
...
VG ZAS Fire stolen
2013-11-03 08:33:03 -08:00
Chinsky
a210c1b613
derp XOR
2013-11-03 20:31:50 +04:00
Chinsky
8274114e47
VG ZAS Fire stolen
2013-11-03 20:28:26 +04:00
DJSnapshot
acc94c6f85
Fix for auto-transfer being called every 10 minutes after the first 3 hours.
2013-11-02 18:11:09 -07:00
