ikarrus
c3eef7846b
-Added Nienhaus's new HoP uniform and cap. Old sprites are renamed to hop_old
...
-Removed HoP's spawning armor and moved the one in the locker higher up in order
-Glory to Nanotrasen
2014-03-12 22:32:49 -06:00
Ikarrus
6147bf6053
Returned armor vest to the HoP's locker
2014-03-12 10:25:29 -06:00
ikarrus
fba4280ec2
Removes HoP's armor and helmet
2014-03-12 08:47:01 -06:00
fleure
b6e7155a24
Changed janitor and atmos tanks slightly
2014-03-10 20:27:21 +00:00
Cheridan
8423e6765c
Merge pull request #3002 from Aranclanos/GrabOnLockers
...
Grabs won't runtime anymore on lockers
2014-03-09 16:10:20 -05:00
Steelpoint
55beb8c8b3
TakeTwo
2014-03-08 23:50:15 +08:00
Ergovisavi
062f368ce0
Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
2014-03-07 04:24:51 -08:00
fleure
026c991b95
Added atmos and jani watertanks, changed nozzle types
2014-03-07 01:13:19 +00:00
Ergovisavi
a3ce04c000
Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
...
Item attack changes
2014-03-06 03:17:02 -08:00
Aranclanos
ad3c76ef31
Grabs won't runtime anymore on lockers
2014-03-05 21:20:06 -03:00
Razharas
c548df264b
Conflict fix
2014-03-05 06:30:29 +04:00
Razharas
f3ccaa5936
Merge conflicts fix
2014-03-03 05:42:31 +04:00
MrSnapwalk
789134d8f2
Automerge fix
...
Fixing the conflicts preventing an automerge.
2014-03-02 17:03:35 -06:00
MrSnapwalk
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
Razharas
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
MrSnapwalk
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
Ergovisavi
ac269baacb
Fixes bullet_act not checking for damagetype on many, many objects.
...
Replaces Holodamage with Stamina damage, if your stamina damage exceeds your current health, you get weaken(5)'d. Stamina heals itself slowly over time.
Makes the hallucination enemies deal more stamina damage than they did holodamage, but stamina damage heals now so it's mostly for just seeming threatening at the moment.
Adds the Disabler, a gun that does stamina damage. It has a range of your screen, but no more. Adds a disabler crate to cargo (security lock)
Fixes Lasertag ED209's because they were busted as shit
Reduces ED209's view range to 9 from 12, which was several times longer than your screen view, now is only a little bit more
Lastertag now does stamina damage instead of an instant stun for that GRITTY LASERTAG EXPERIENCE
2014-03-01 16:39:22 -08:00
Razharas
2fd5557682
Conflict fix
2014-03-02 04:14:32 +04:00
hornygranny
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
Cheridan
011a78f478
Merge pull request #2902 from Miauw62/actualbranchnamesyounerd
...
Fixes NODROP not playing nice with tables.
2014-02-25 22:37:09 -06:00
Cheridan
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
Cheridan
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
ChuckTheSheep
0bba6f4fae
Merge remote-tracking branch 'upstream/master' into Morgue-Slab-Fix
2014-02-25 20:21:21 -05:00
ChuckTheSheep
fd8cd6ebc3
Fixes Speaking, Whoops
2014-02-25 13:38:06 -05:00
Miauw
41a9321d2a
rip in peace more parems
2014-02-24 19:43:09 +01:00
Miauw
27d0b64032
Fixes NODROP not playing nice with tables.
...
(thx for submitting bug reports guise)
2014-02-24 19:38:10 +01:00
Miauw
8ed2cdb07a
Fixed #2899
2014-02-24 19:25:57 +01:00
Razharas
ba54bd940b
Conflict fix
2014-02-24 22:12:02 +04:00
Razharas
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
Razharas
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
ChuckTheSheep
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
Razharas
c31c76b4ab
Quick fix for tables, lockers and general drop_item
...
Shall do the trick
2014-02-21 05:15:40 +04:00
ChuckTheSheep
95bc337d62
A lot of Stuff From: #2849
...
https://github.com/tgstation/-tg-station/pull/2849
2014-02-20 13:28:07 -05:00
Ergovisavi
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
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
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
Hornygranny
9323c35a51
fixed disastrous and shameful failure
2014-02-13 19:16:53 -08:00
hornygranny
e0d0cedf36
passed over everything with throwforce
2014-02-13 18:06:50 -08:00
Fleure
cf4f6dcef2
Reduced number of possible chicks from a chicken crate
2014-02-13 19:20:14 +00:00
Ergovisavi
892ffd3879
Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
2014-02-09 22:37:20 -08:00
Ergovisavi
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
Razharas
0efd94884e
Merge pull request #2658 from Rockdtben/refactorMineralDoor
...
Refactored Close() and Open()
2014-02-08 04:32:42 -08:00
fleure
bc733a83a4
Merge pull request #2650 from Giacom/master
...
MiniStation Update
2014-02-06 20:14:25 +00:00
Rockdtben
d5ccdb6ef1
fixes resin doors
2014-02-05 22:44:31 -06:00
Rockdtben
216026ae82
Refactored Close() and Open()
2014-02-05 19:00:35 -06:00
Rockdtben
6a9a7896c6
Merge pull request #2380 from Aranclanos/MineralDoors
...
Mineral doors, small fixes.
2014-02-05 18:20:21 -06:00
Giacomand
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
fleure
26afced91b
Merge pull request #2629 from Giacom/master
...
MiniStation Update
2014-02-05 18:38:03 +00:00
fleure
fd81304128
Merge pull request #2612 from Mercenaryblue/master
...
The LaserTag update: Part one
2014-02-05 18:31:08 +00:00
Mercenaryblue
c3a2861bf8
Update fitness.dm
...
Extra kits in the lockers
2014-02-04 21:53:17 -05:00
