c548df264b
Conflict fix
2014-03-05 06:30:29 +04:00
f3ccaa5936
Merge conflicts fix
2014-03-03 05:42:31 +04:00
789134d8f2
Automerge fix
...
Fixing the conflicts preventing an automerge.
2014-03-02 17:03:35 -06:00
b03fc3d645
More suits, and more fixes.
...
More suits by Nienhaus, and a few fixes for the contents of lockers.
Also added a dermal armor patch to the Captain's locker, for added head
protection without the downside of helmet-hair.
2014-03-02 16:10:08 -06:00
3cb5c7380f
Merge pull request #2894 from ChuckTheSheep/Morgue-Slab-Fix
...
Fixes an oversight in my slab code + New recursive mob check
2014-03-02 12:42:30 -08:00
b6a60a07b4
Makes fancy items obtainable.
...
Adds a formal-wear crate, makes lawyers have laceup shoes, adds a better
sprite for the memorizer, adds the formal uniforms to each job's closet,
and fixes a typo in the object name of the black jacket. [FORMALNESS
INTENSIFIES]
2014-03-01 19:44:22 -06:00
2fd5557682
Conflict fix
2014-03-02 04:14:32 +04:00
c31647376e
This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it.
...
Shoes do not increase your movement speed
Stun/weaken on basically everything reduced from 10+ to 5 ticks
Time to unbuckle/uncuff self halved
2014-02-27 10:56:06 -08:00
011a78f478
Merge pull request #2902 from Miauw62/actualbranchnamesyounerd
...
Fixes NODROP not playing nice with tables.
2014-02-25 22:37:09 -06:00
004b005ab2
Merge pull request #2901 from Miauw62/aijgdiajgiojdaigjapgijsgdipjagiojaranisafagaidpjgiaopjgdoiadjgaipgjpijadgijagipjadijigpaijgdipajgdipajdgpiadjgpajgd
...
Fixed #2899 (NODROP and closets doing weird shit)
stop making retarded branch names miauw
2014-02-25 22:29:39 -06:00
5ec24c8613
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk
...
Conflicts:
_maps/map_files/tgstation.2.1.2.dmm
code/modules/reagents/Chemistry-Reagents.dm
resolved with Theirs, must manually reapply fixes
2014-02-25 19:39:26 -06:00
0bba6f4fae
Merge remote-tracking branch 'upstream/master' into Morgue-Slab-Fix
2014-02-25 20:21:21 -05:00
fd8cd6ebc3
Fixes Speaking, Whoops
2014-02-25 13:38:06 -05:00
41a9321d2a
rip in peace more parems
2014-02-24 19:43:09 +01:00
27d0b64032
Fixes NODROP not playing nice with tables.
...
(thx for submitting bug reports guise)
2014-02-24 19:38:10 +01:00
8ed2cdb07a
Fixed #2899
2014-02-24 19:25:57 +01:00
ba54bd940b
Conflict fix
2014-02-24 22:12:02 +04: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
b27d9c7396
Added RPED, some sprites and new power cell path
...
Your dreams of big part storage and fast machine part exchange came true
14 slot R&D part-only autoseeker/picker/dropper/exchager is in
Added different sprites for better capacitors and scanning modules
Changed the power cell type to be compatible with all this machine
changing faggotry
All sprites here are codersprites so ask nien/WJ for better ones if you
want
2014-02-24 05:14:43 +04:00
d3b9ec2271
Fixes an oversight in my slab code
...
Initial code now works as intended, did not realize the recursive mob
check was looking for clients, now it looks for any mobs.
2014-02-23 17:33:13 -05:00
c31c76b4ab
Quick fix for tables, lockers and general drop_item
...
Shall do the trick
2014-02-21 05:15:40 +04:00
95bc337d62
A lot of Stuff From: #2849
...
https://github.com/tgstation/-tg-station/pull/2849
2014-02-20 13:28:07 -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
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
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
9323c35a51
fixed disastrous and shameful failure
2014-02-13 19:16:53 -08:00
e0d0cedf36
passed over everything with throwforce
2014-02-13 18:06:50 -08:00
cf4f6dcef2
Reduced number of possible chicks from a chicken crate
2014-02-13 19:20:14 +00:00
892ffd3879
Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
2014-02-09 22:37:20 -08:00
bf17c3328e
Asteroid Overhaul v1.0
...
Mining Equipment Locker and associated items
Asteroid map rework
Mining Mob rebalancing
Minor fixes
2014-02-09 19:51:05 -08:00
0efd94884e
Merge pull request #2658 from Rockdtben/refactorMineralDoor
...
Refactored Close() and Open()
2014-02-08 04:32:42 -08:00
bc733a83a4
Merge pull request #2650 from Giacom/master
...
MiniStation Update
2014-02-06 20:14:25 +00:00
d5ccdb6ef1
fixes resin doors
2014-02-05 22:44:31 -06:00
216026ae82
Refactored Close() and Open()
2014-02-05 19:00:35 -06:00
6a9a7896c6
Merge pull request #2380 from Aranclanos/MineralDoors
...
Mineral doors, small fixes.
2014-02-05 18:20:21 -06:00
7319456770
MiniStation Update
...
Fixes a runtime with the vent clogging event, which happens to MiniStation.
Lowered all vent requirements to 20.
Fixed transit tubes from breaking by reversing the pod direction twice.
Changed the icon state name of the terminators so that they had density.
Transit tubes will now reset the view of the mob exiting.
2014-02-05 22:04:58 +00:00
26afced91b
Merge pull request #2629 from Giacom/master
...
MiniStation Update
2014-02-05 18:38:03 +00:00
fd81304128
Merge pull request #2612 from Mercenaryblue/master
...
The LaserTag update: Part one
2014-02-05 18:31:08 +00:00
c3a2861bf8
Update fitness.dm
...
Extra kits in the lockers
2014-02-04 21:53:17 -05:00
061b6aab4a
Merge pull request #2607 from adrix89/Fix_1653
...
Fix 1653
2014-02-04 17:40:30 -08:00
b8329e7f2b
Fixed a few map bugs on MiniStation.
...
Added the missing mini-hoe and hatchet to the garden area.
Added reverse stations which will send pods in the opposite direction, after their stop.
Added tube terminators for you to put on the end of non-looping tubes.
2014-02-04 20:13:07 +00:00
ba1c517ad1
Grill bugfix
2014-02-04 11:49:22 +02:00
35976a9cf8
Update fitness.dm
...
Adds LaserTag helmets to fitness lockers.
2014-02-03 23:02:12 -05:00
ad235cf18f
Merge pull request #2563 from Razharas/NewTables
...
New PR for crafting tables
2014-02-03 08:46:56 -08:00
97b99e47f6
Merge pull request #2558 from MrPerson/rollerbeds
...
Fixes rollerbeds and their offsets so they don't look stupid.
2014-01-31 14:13:51 -08:00
b4f011bacb
Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/power/cable.dm
Fixing conflicts
2014-01-31 05:20:59 +04:00
6c07d2bae2
Merge pull request #2549 from Incoming5643/PussyGalore
...
Fixes the fucking cat crate jesus christ goddamn
2014-01-30 14:56:50 -08:00
a8aff5e534
Fixes the Fix, wouldn't want people getting two corgis for the price of one, no that'd be terrrrrrrible
2014-01-30 10:52:32 -05:00
b4d2ba33cb
Fixes rollerbeds and their offsets so they don't look stupid.
2014-01-30 06:02:46 -08:00
40cd679747
Fixes Cat Crates, Corgi Crates and Chick crates.
...
File bug reports you guys, seriously.
2014-01-29 19:20:26 -05:00
Razharas
MrSnapwalk
Razharas
hornygranny
Cheridan
ChuckTheSheep
Miauw
Ergovisavi
Fleure
Rockdtben
Giacomand
Mercenaryblue
adrix89
Incoming
MrPerson