f355feb129
Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag
2014-03-02 04:59:35 +04:00
bb6009c9b7
Merge conflicts a bitch
2014-03-02 04:34:56 +04:00
08064142e6
Merge branch 'master' of https://github.com/tgstation/-tg-station into LingSting
2014-03-02 04:29:26 +04:00
2fd5557682
Conflict fix
2014-03-02 04:14:32 +04:00
056932aa58
corrects unbuckle feedback message
2014-02-27 21:59:43 -08: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
5c55636bc0
Revert "Removes radio from pAI"
...
This reverts commit 0dc364a6b1
2014-02-26 14:50:18 +01:00
6695c0c13b
Merge pull request #2850 from MrPerson/revenge_of_kitty_ears
...
Return of kitty ears
2014-02-26 07:40:39 -02:00
9a2426a219
Merge pull request #2903 from hornygranny/harmyeller
...
Removes pAI radio
2014-02-25 17:19:11 -06:00
56f94f59da
Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag
2014-02-25 05:05:22 +04:00
ff08e7c557
Merge pull request #2893 from Miauw62/gurehibjkogtirfhdgyf(ihgufhygdfrgjihkigfjuhygdfhijgufhygdhufrg
...
Fixed more NODROP runtimes
2014-02-24 13:43:33 -06:00
0dc364a6b1
Removes radio from pAI
2014-02-24 10:44:26 -08:00
ba54bd940b
Conflict fix
2014-02-24 22:12:02 +04:00
b64ba5ba1e
Merge pull request #2887 from Giacom/statue_fixes
...
Silicons no longer stop statues from being able to move.
2014-02-24 14:59:00 -02:00
0a8e8a6b3e
Merge pull request #2843 from MrPerson/its_a_beeeeeeeeeeeeaaaaaaaarrrr!!!!!
...
Standardized space bears.
2014-02-24 08:07:48 -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
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
f75692ceed
Fixed more NODROP runtimes
2014-02-23 19:34:49 +01:00
2a7f688d90
Fixes a NODROP runtime.
2014-02-23 19:20:27 +01:00
e6c856e456
Merge pull request #2803 from Rockdtben/SyndCardDesc
...
Synd card desc
2014-02-23 13:46:10 -02:00
916e7c9ec3
Silicons no longer stop statues from being able to move.
...
Added a variable that will allow you to have the statues move while seen.
2014-02-22 22:22:02 +00: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
8af22aeeac
Merge pull request #2861 from hornygranny/muhspans
...
Fixes #2726 , #2729
2014-02-21 20:39:58 -06: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
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
e38a012697
Merge pull request #2840 from Aranclanos/hatsaway
...
removes the chance of your hat flying off
2014-02-20 10:11:43 +00:00
c0ef4353b5
Merge branch 'master' of https://github.com/tgstation/-tg-station into revenge_of_kitty_ears
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
Fucking laser tag helmets were conflicting. Lucky me!
2014-02-19 21:49:22 -08:00
4a73518965
Readded kitty ears
...
Not on the map yet, gonna do that next I suppose.
2014-02-19 21:23:40 -08:00
807590e4d3
Fixes an unequip runtime
2014-02-19 21:04:50 +01:00
5cf93a55ea
Merge pull request #2804 from Perakp/borgAnimations
...
Animated cyborg transformations
2014-02-19 19:02:34 +00:00
5a3ad8c138
Standardized space bears.
...
Removed a bunch of special space bear behavior to make them like other simple_animals. Fixes #272
2014-02-19 10:10:41 -08:00
19e4407e0d
removes the chance of your hat flying off
2014-02-19 07:00:14 -03: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
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
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
ea7318985d
Merge pull request #2714 from Ergovisavi/asteroid_overhaul
...
[MAP] Asteroid/Mining Overhaul
2014-02-17 16:44:46 -08:00
b78c7eca06
Merge pull request #2809 from hornygranny/throwspeed
...
throwspeed pass
2014-02-17 06:26:06 -02: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
b198ea5c9a
Merge pull request #2795 from AnturK/machinegunqueen
...
Fix for neurotox machine gun queens
2014-02-16 08:45:16 -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
b48efdaed0
Merge pull request #2761 from Incoming5643/blobjob
...
Blobize edge case fix
2014-02-16 08:28:46 -08:00
30d5da6205
Merge pull request #2769 from Aranclanos/handcuffedhands
...
you can't give items to people handcuffed.
2014-02-16 14:26:52 +00:00
9d3f8f6a2d
second pass
2014-02-15 20:11:12 -08:00
Razharas
Hornygranny
Miauw
Aranclanos
Rockdtben
Cheridan
Razharas
Giacomand
fleure
MrPerson
Perakp
Ergovisavi