RandomMarine
1be87663f5
Formatting.
2014-03-02 05:57:50 -08:00
RandomMarine
f71e4dc23a
Okay I think this is good now.
2014-03-02 05:43:25 -08:00
RandomMarine
a76b4d6495
Whoops
2014-03-02 05:22:43 -08:00
RandomMarine
d40d750c7a
Test one
2014-03-02 05:03:03 -08:00
Cheridan
b723f68979
Merge pull request #2868 from Aranclanos/StopThinkingBrain
...
Stops brains generating runtimes by toggling throw mode
2014-02-22 12:58:36 -06:00
Aranclanos
db8f4b66f5
Merge pull request #2874 from Razharas/RuntimesFix
...
DNA and R&D console runtimes fix
2014-02-22 11:52:07 -02:00
Rockdtben
e591d8099e
Merge pull request #2859 from hornygranny/gibtonitelog
...
Fixes #2783
2014-02-21 20:42:49 -06:00
Rockdtben
8af22aeeac
Merge pull request #2861 from hornygranny/muhspans
...
Fixes #2726 , #2729
2014-02-21 20:39:58 -06:00
hornygranny
cdc4d4f073
added coords to server log
2014-02-21 11:31:34 -08:00
Razharas
561efa4943
DNA and R&D console runtimes fix
...
Quiet simple
2014-02-21 17:37:14 +04:00
Aranclanos
2a8e2c5009
Stops brains generating runtimes by toggling throw mode
2014-02-21 08:52:05 -03:00
Aranclanos
94a5e4e04e
Merge pull request #2846 from Miauw62/kagipjadgipgj
...
Fixes an unequip runtime
2014-02-20 23:54:52 -02:00
Razharas
ff27f5d426
Merge pull request #2826 from YotaXP/polaroid-fix
...
Long overdue fixes to the Polaroid cameras.
2014-02-20 16:22:59 -08:00
hornygranny
031515bd85
made slime shock messaged more gudlier
2014-02-20 14:56:10 -08:00
hornygranny
ed12a9cfb0
missing exclamation points
2014-02-20 12:41:23 -08:00
hornygranny
a86de57c05
Fixes #2726
2014-02-20 12:11:00 -08:00
hornygranny
6278f10817
Fixes #2783
2014-02-20 11:33:27 -08:00
fleure
b86cb8dfb8
Merge pull request #2841 from Aranclanos/box2550
...
Removes the away mission box2550
2014-02-20 10:12:07 +00:00
fleure
e38a012697
Merge pull request #2840 from Aranclanos/hatsaway
...
removes the chance of your hat flying off
2014-02-20 10:11:43 +00:00
Miauw
807590e4d3
Fixes an unequip runtime
2014-02-19 21:04:50 +01:00
fleure
8108cb1b7f
Merge pull request #2811 from Ccomp5950/master
...
Code effeciency project: apc icon_update()
2014-02-19 19:09:05 +00:00
fleure
5cf93a55ea
Merge pull request #2804 from Perakp/borgAnimations
...
Animated cyborg transformations
2014-02-19 19:02:34 +00:00
fleure
ad1c13a2d3
Merge pull request #2828 from Mercenaryblue/Lasertag2
...
Issue #2684 Fixed
2014-02-19 18:46:52 +00:00
fleure
e80dd57ef4
Merge pull request #2819 from YotaXP/fix-1957
...
Fixes major security exploit regarding JavaScript injection.
2014-02-19 18:34:48 +00:00
Aranclanos
19e4407e0d
removes the chance of your hat flying off
2014-02-19 07:00:14 -03:00
Aranclanos
e5ba65bb78
Removes the away mission box2550
2014-02-19 06:53:15 -03:00
Razharas
5a8eed4c32
Merge pull request #2824 from hornygranny/throw_range
...
throw_range pass
2014-02-18 16:17:13 -08:00
Perakp
bf6f9d3786
If this works I'll be very happy
...
I think I’ll try to merge these commits later.
2014-02-19 00:42:15 +02:00
Perakp
9f43935f89
Trying to fix mob.dm merge conflicts
...
I’ll do this over and over again until it works
2014-02-19 00:28:22 +02:00
Perakp
965e7ad6d8
Merge to master
...
Conflicts in mob.dm
2014-02-18 23:59:59 +02:00
YotaXP
35ba26b3ea
Fixed coloring, overlays on overlays, and blood trails.
2014-02-18 16:54:22 -05:00
Miauw
fe9a5b0513
DONT PANIC DONT PANIC DONT PANIC
2014-02-18 18:50:32 +01:00
Miauw
9d74d4c840
i save the fucking day and replace a single u_equip into unEquip
2014-02-18 18:23:37 +01:00
Miauw
3b24bb64f4
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
...
Conflicts:
code/modules/mob/transform_procs.dm
2014-02-18 18:22:40 +01:00
Miauw
65db954b38
Fixed misc complaints about NODROP
2014-02-18 18:17:55 +01:00
Mercenaryblue
8f2ba65d9b
Sprites for the LaserTag Helmets added.
...
Issue #2684 Fixed.
Thanks to Aranclanos for helping me out.
2014-02-18 06:02:50 -05:00
YotaXP
ee58c42570
Long overdue fixes to the Polaroid cameras.
...
- Mobs lying down are captured properly.
- Hair and other coloring is captured properly.
- Darkness is now captured, though other area effects are not.
- Object layering is much more accurate, though still not perfect.
- Objects that were missing should now be visible.
- Objects that should not have been visible should now be gone.
- Some objects (like blood trails) are not yet captured properly.
2014-02-17 21:41:56 -05:00
Ccomp5950
fdc0a26b00
Removed extra overlays length check.
...
No reason to do that if we're doing it again 2 lines down.
2014-02-17 19:07:53 -06:00
Razharas
ea7318985d
Merge pull request #2714 from Ergovisavi/asteroid_overhaul
...
[MAP] Asteroid/Mining Overhaul
2014-02-17 16:44:46 -08:00
Hornygranny
2134add41b
Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.
2014-02-17 15:44:07 -08:00
WitheredGryphon
e1ec5cf54f
Fixes major security exploit regarding JavaScript injection.
2014-02-17 12:53:41 -05:00
Aranclanos
b78c7eca06
Merge pull request #2809 from hornygranny/throwspeed
...
throwspeed pass
2014-02-17 06:26:06 -02:00
Ergovisavi
1749d38d56
Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
...
Fixed possible runtime issue with Jaunters, fixed merge issues, changed mining points to examine from attack self
2014-02-16 19:36:48 -08:00
Ccomp5950
91fbd0ef88
Code effeciency project: apc icon_update()
...
caching the icon states instead of creating them each time
checking to see if any icon_state or overlay changes and only
applying the ones that do.
2014-02-16 12:17:41 -06:00
Razharas
b198ea5c9a
Merge pull request #2795 from AnturK/machinegunqueen
...
Fix for neurotox machine gun queens
2014-02-16 08:45:16 -08:00
Razharas
be73e9d09f
Merge pull request #2771 from fleure/eggs
...
Increased egg hatch rate and reduced chicks in crate
2014-02-16 08:37:49 -08:00
Razharas
923f8fc565
Merge pull request #2800 from MrPerson/del_in_progress
...
Only report emitter/SMES deletion if the round's in progress.
2014-02-16 08:36:25 -08:00
Razharas
b48efdaed0
Merge pull request #2761 from Incoming5643/blobjob
...
Blobize edge case fix
2014-02-16 08:28:46 -08:00
fleure
e6269beb3f
Merge pull request #2782 from Aranclanos/jobmasterruntime
...
Small runtime fix, job preference change before setup
2014-02-16 14:36:21 +00:00
fleure
aead3ee208
Merge pull request #2770 from Aranclanos/singularitynomnom
...
singularity spawn() runtimes
2014-02-16 14:30:47 +00:00
