Commit Graph

4213 Commits

Author SHA1 Message Date
mwerezak
5b341bd810 IB initial damage now depends on damage taken
Also, autohealing IBs no longer stop bleeding, but do stop worsening.
2014-08-16 22:00:55 -04:00
Chinsky
658941a0f9 Merge pull request #5978 from Zuhayr/journalism
Mining changes and basic character backgrounds.
2014-08-14 10:54:49 +04:00
MrSnapwalk
6b44ef8ff1 Adds new hair. 2014-08-13 20:15:07 -05:00
Chinsky
1c5e944ce5 Merge pull request #5954 from Zuhayr/dev
No one is going to read this all anyway
2014-08-13 18:33:09 +04:00
Zuhayr
688cf22a67 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-08-13 17:10:37 +09:30
iamgoofball
88c034a30b Ports the "Family Man" Hair Pack from /vg/station. 2014-08-11 13:25:57 -07:00
PsiOmega
c3de9ca3c7 Fixes #5946 and cuts down on duplicate code across Life() procs. 2014-08-11 10:42:32 +02:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
Zuhayr
beaad5a37b Merged in preferences file changes, changed None to Unset for home system. 2014-08-11 10:38:01 +09:30
Zuhayr
a2945a00d7 Merge pull request #5940 from mwerezak/power-net
Update for shield generator power use and power net fixes
2014-08-11 10:13:26 +09:30
Whitellama
49c8c6f2cb Made arcane tomes a subtype of books, fixes #5838 2014-08-10 02:23:36 -07:00
Whitellama
cfa1ff3440 Fixed Dionaea crashing on death 2014-08-10 01:00:26 -07:00
mwerezak
e1dc7d436b Fixes icons and other things not updating when the master controller updates power status.
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
2014-08-10 03:45:20 -04:00
mwerezak
213b11601e Updates emitters and containment field power usage
As well as PA power usage. It's not used at the moment, but it might be
used by downstream or in the future.
2014-08-10 00:40:58 -04:00
Ccomp5950
882d505824 Merge pull request #5917 from mwerezak/fix
Some fixes
2014-08-08 20:45:27 -05:00
PsiOmega
00fcfa7899 Makes it possible to setup pAI configuration from the character setup screen. 2014-08-08 13:31:52 +02:00
PsiOmega
8568a6aa89 Explicit proc/Topic definitions. 2014-08-08 13:21:51 +02:00
Walter0o
4c6349f585 fixes #5914
user message blatantly stolen from /tg/ <3
2014-08-07 23:41:11 +02:00
mwerezak
170e03d736 Fixes yank out object bloodying the wrong hands 2014-08-07 16:49:44 -04:00
Zuhayr
00fc8c53ba Merge pull request #5898 from Walter0o/patch-1
fixes #5876
2014-08-05 13:22:26 +09:30
Ccomp5950
ec3262a2a9 Merge pull request #5894 from atlantiscze/cyborg_module_icons
Cyborg component icons!
2014-08-04 19:38:57 -05:00
Zuhayr
33ef081191 Merge pull request #5895 from mwerezak/fixes
Fixes
2014-08-05 08:23:38 +09:30
Walter0o
dcc3393b25 fixes #5876
stun beams killed simple animals
2014-08-04 23:41:23 +02:00
Ccomp5950
a4fc1bfd6a Merge pull request #5886 from mwerezak/stun-baton
Fixes some handcuff oversights
2014-08-04 15:15:52 -05:00
mwerezak
6a7c9e46e6 Fixes #5881 2014-08-04 13:04:34 -04:00
Atlantiscze
3627417c7b - Adds cyborg module icons. Each component has it's own specific icon now. Two icons are animated, four static. Includes broken versions.
- AI radio icon (chat icon) updated to use icon from robot_component.dmi file - removed duplicity from radio.dmi
- Cyborg radio icon (chat icon) updated to look like the radio module.
2014-08-04 09:25:53 +02:00
mwerezak
cf9fe8de76 Fixes some handcuff oversights
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
2014-08-03 11:49:37 -04:00
Loganbacca
b8f31c0b0a Train fixes and balancing
- Slows trains to 90% of running speed
- Changes train impact damage to only take into account speed, not train length (otherwise you could insta kill people with a long enough train)
- Fixes a bug with towed cars ghosting through closed airlocks
- Stuns mobs who fall off a train that has blown up
- Fixes mobs standing/lying on vehicles
- Fixes exploding trains not decoupling correctly
2014-08-03 20:45:41 +12:00
Zuhayr
eae182725a Merge pull request #5865 from mwerezak/shock-fix
Fixes siemens_coefficent not affecting shock damage
2014-08-03 13:04:52 +09:30
Zuhayr
f510c05865 Merge pull request #5862 from mwerezak/stun-baton
Stun Baton Nerf
2014-08-03 12:59:54 +09:30
Zuhayr
67799a5324 Merge pull request #5871 from PsiOmegaDelta/PhotoAI
Fixes runtime error when borgs attempt to sync photos with master AI
2014-08-03 12:58:15 +09:30
Zuhayr
2619fb61ce Merge pull request #5872 from PsiOmegaDelta/Manifest
Fixes #5867
2014-08-03 12:57:19 +09:30
Zuhayr
ab54e7e2d6 Merge pull request #5878 from Walter0o/aliums
fixes alien castes not understanding each other
2014-08-03 12:56:47 +09:30
Mloc
e2ea86eab1 Merge pull request #5699 from Zuhayr/calamity
Calamity mode.
2014-08-02 11:39:29 +01:00
mwerezak
91d503e209 Removes duplicate code from human/bullet_act
Also moves stun projectile handling up to living/bullet_act, as all the
human specific code has been moved to other procs
2014-08-01 23:57:18 -04:00
Walter0o
5895a098fe fixes alien castes not understanding each other
only /mob/living/carbon/alien have this var set, so this will not touch anything else.
2014-08-01 22:34:28 +02:00
Zuhayr
0868c344cc Adjustments and a typo fix. 2014-08-01 23:50:33 +09:30
Mloc
6133083ca6 Merge pull request #5858 from Zuhayr/master
Fixes
2014-08-01 15:02:23 +01:00
Zuhayr
9eefdf4db8 A bit of prep work for integegrating player-set backgrounds into gameplay. 2014-08-01 22:54:57 +09:30
Zuhayr
1bd8b7baf0 Added citizenship, faction, religion and home system to character generation. 2014-08-01 22:05:38 +09:30
Zuhayr
21b02f3019 Merge pull request #5846 from Walter0o/href_fun
exploit-fix-o-rama
2014-08-01 21:59:00 +09:30
PsiOmega
8104928e75 Creates a shared proc for applying AI verbs. DRY. Arranges some consistency among verbs.
Fixes #5867 as well as a couple other missing verbs.
2014-08-01 10:36:44 +02:00
PsiOmega
c416205c7d Moves robot/drone specific New()-code into their respective classes, handling it using proc-overloads.
Also re-arranges robot init() code to prevent a runtime error when attempting to synch photos with the Master AI.
2014-08-01 09:17:26 +02:00
mwerezak
63aab94d3c Cleans up weapon embedding code
Removed weapon embedding from human/apply_damage(), as it didn't really
belong there. As well, used_weapon is intended mainly for autopsy info,
so it didn't seem appropriate to use it to embed things.
2014-07-31 19:43:36 -04:00
mwerezak
768019b918 Stunbaton fixes and cleanup
Apparently harm intent is "hurt", not "harm"
2014-07-31 19:17:05 -04:00
mwerezak
71e54111ab Handcuffs now require an aggressive grab 2014-07-31 18:10:11 -04:00
mwerezak
8bd7a11ff4 Fixes siemens coefficient not blocking stun disarm 2014-07-31 17:19:35 -04:00
mwerezak
697979c2f6 Makes humans scream if taking enough halloss 2014-07-31 17:06:42 -04:00
mwerezak
5b90e4afc6 Allows the use of stun weapons to show up in autopsies 2014-07-31 17:01:06 -04:00
mwerezak
ecd7df9628 Adds disarm effect for stun weapons and hands 2014-07-31 16:52:50 -04:00