90fe98402c
Merge pull request #2890 from Razharas/TeleSci
...
Telescience fix
2014-02-24 14:04:59 -02:00
94907b1311
Merge pull request #2839 from Aranclanos/BloodReagent
...
Blood runtimes fix.
2014-02-24 07:56:39 -08:00
d8f12f0680
Merge pull request #2836 from Cheridan/hydro
...
Drying Rack as smartfridge
2014-02-24 07:56:17 -08:00
3d90e8815e
Merge pull request #2827 from Ergovisavi/muh_vision
...
Adding NVG's/Advanced Mesons to the protolathe, some human vision changes
2014-02-24 07:55:34 -08:00
00512ba146
Merge pull request #2805 from rymd/somatoray
...
Floral somatoray requires radium instead of uranium
2014-02-24 07:54:39 -08:00
e6c856e456
Merge pull request #2803 from Rockdtben/SyndCardDesc
...
Synd card desc
2014-02-23 13:46:10 -02:00
84e1d9872e
Telescience fix
...
Fixes infinite telecrystals from telescience
I tested most of the computers and they were good
No idea who put initialize into new and why
2014-02-23 16:54:52 +04:00
e306f40647
Merge pull request #2870 from Aranclanos/ReagentCodeSpawn
...
Removed some spawn(0) calls from the reagent code, fixes runtimes.
2014-02-22 23:39:35 -06:00
c91a3a1ed5
Merge pull request #2856 from Giacom/wiki_manuals
...
[MAP] Added a new wiki manual subtype which will allow you to easily add new book/manuals which link to the wiki.
2014-02-22 23:28:04 -06:00
b723f68979
Merge pull request #2868 from Aranclanos/StopThinkingBrain
...
Stops brains generating runtimes by toggling throw mode
2014-02-22 12:58:36 -06:00
db8f4b66f5
Merge pull request #2874 from Razharas/RuntimesFix
...
DNA and R&D console runtimes fix
2014-02-22 11:52:07 -02:00
e591d8099e
Merge pull request #2859 from hornygranny/gibtonitelog
...
Fixes #2783
2014-02-21 20:42:49 -06:00
8af22aeeac
Merge pull request #2861 from hornygranny/muhspans
...
Fixes #2726 , #2729
2014-02-21 20:39:58 -06:00
cdc4d4f073
added coords to server log
2014-02-21 11:31:34 -08:00
67c595cbe6
Removed some spawn(0) calls from the reagent code, fixes runtimes.
...
I looked in the code and tested, it looks like everything won't blow up with this, but we can't never be too cautious.
2014-02-21 11:08:02 -03:00
561efa4943
DNA and R&D console runtimes fix
...
Quiet simple
2014-02-21 17:37:14 +04:00
2a8e2c5009
Stops brains generating runtimes by toggling throw mode
2014-02-21 08:52:05 -03:00
94a5e4e04e
Merge pull request #2846 from Miauw62/kagipjadgipgj
...
Fixes an unequip runtime
2014-02-20 23:54:52 -02:00
ff27f5d426
Merge pull request #2826 from YotaXP/polaroid-fix
...
Long overdue fixes to the Polaroid cameras.
2014-02-20 16:22:59 -08:00
031515bd85
made slime shock messaged more gudlier
2014-02-20 14:56:10 -08:00
ed12a9cfb0
missing exclamation points
2014-02-20 12:41:23 -08:00
a86de57c05
Fixes #2726
2014-02-20 12:11:00 -08:00
6278f10817
Fixes #2783
2014-02-20 11:33:27 -08:00
a45791e54f
Added a new wiki manual subtype which will allow you to easily add new book/manuals which link to the wiki.
...
Made the wiki books use the config's wikiurl.
Updated some information in the non-wiki manuals.
You can now specificy a book's window size, the wiki books will be given a value since they are not automatically set the window size.
2014-02-20 17:47:33 +00:00
b86cb8dfb8
Merge pull request #2841 from Aranclanos/box2550
...
Removes the away mission box2550
2014-02-20 10:12:07 +00:00
e38a012697
Merge pull request #2840 from Aranclanos/hatsaway
...
removes the chance of your hat flying off
2014-02-20 10:11:43 +00:00
807590e4d3
Fixes an unequip runtime
2014-02-19 21:04:50 +01:00
8108cb1b7f
Merge pull request #2811 from Ccomp5950/master
...
Code effeciency project: apc icon_update()
2014-02-19 19:09:05 +00:00
5cf93a55ea
Merge pull request #2804 from Perakp/borgAnimations
...
Animated cyborg transformations
2014-02-19 19:02:34 +00:00
ad1c13a2d3
Merge pull request #2828 from Mercenaryblue/Lasertag2
...
Issue #2684 Fixed
2014-02-19 18:46:52 +00:00
e80dd57ef4
Merge pull request #2819 from YotaXP/fix-1957
...
Fixes major security exploit regarding JavaScript injection.
2014-02-19 18:34:48 +00:00
19e4407e0d
removes the chance of your hat flying off
2014-02-19 07:00:14 -03:00
e5ba65bb78
Removes the away mission box2550
2014-02-19 06:53:15 -03:00
384ff65700
Blood now will have their data list properly generated when the reagent is created. It fixes several runtimes related to it.
2014-02-19 03:40:47 -03:00
5a8eed4c32
Merge pull request #2824 from hornygranny/throw_range
...
throw_range pass
2014-02-18 16:17:13 -08:00
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
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
965e7ad6d8
Merge to master
...
Conflicts in mob.dm
2014-02-18 23:59:59 +02:00
35ba26b3ea
Fixed coloring, overlays on overlays, and blood trails.
2014-02-18 16:54:22 -05:00
839ee11308
Merge branch 'master' of https://github.com/tgstation/-tg-station into hydro
...
Conflicts:
code/game/machinery/drying_rack.dm
2014-02-18 15:25:16 -06:00
8f509fc4b2
drying rack as smartfridge
...
Converts the drying rack into a smart fridge, allowing for better usability (can now batch-dry), code cleanliness and reuse.
2014-02-18 15:16:40 -06:00
fe9a5b0513
DONT PANIC DONT PANIC DONT PANIC
2014-02-18 18:50:32 +01:00
9d74d4c840
i save the fucking day and replace a single u_equip into unEquip
2014-02-18 18:23:37 +01:00
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
65db954b38
Fixed misc complaints about NODROP
2014-02-18 18:17:55 +01:00
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
62ab59b128
Changed the typepath of HUD sunglasses to be a child of the security hud
...
Removed all the istype checks for glasses in humans
Added advanced mesons (Old meson functionality of removing darkness overlay) and NVG's to the protolathe
2014-02-17 21:00:46 -08:00
3179a3a49b
Increases some stat defaults for hydroponics plants. Allows banana potency to be set. Better documentation of variables.
2014-02-17 20:57:52 -06:00
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
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
Aranclanos
Razharas
Razharas
Cheridan
Rockdtben
hornygranny
Giacomand
fleure
Miauw
Perakp
YotaXP
Mercenaryblue
Ergovisavi
Ccomp5950