PsiOmegaDelta
a4545f8ded
Scheduler, observation, and New() tweaks.
...
Corrects a number of places where New() did not call ..(), and implements similar changes to attempt to ensure New()/initialize() complete running before qdel() runs.
Cuts down on the number of created items during server start.
2015-12-27 17:44:53 +01:00
Sebastian Broberg
14393ea706
Few refraction
2015-12-27 17:05:08 +01:00
PsiOmegaDelta
00b556e768
Merge pull request #11762 from Baystation12/dev-freeze
...
Dev
2015-12-27 16:10:04 +01:00
mwerezak
8b685fdf8f
Fixes #11380
2015-12-27 01:39:34 -05:00
mwerezak
b30f81c7ea
Fixes #11381
2015-12-27 01:28:41 -05:00
PsiOmegaDelta
da0a4c47cf
Merge pull request #11756 from Baystation12/master
...
Dev-freeze
2015-12-26 11:58:42 +01:00
Zuhayr
4169bac4cb
Merge pull request #11754 from PsiOmegaDelta/151225-StackThoseCablesRightHereRightNow
...
Can now join compatible cable coils of any type.
2015-12-26 18:23:43 +10:30
Sebastian Broberg
370529bc42
Refractored soulstone.dm
...
Split the various functions of the proc into multiple procs
Moved the transfer_soul proc under the soulstone object.
2015-12-25 13:04:13 +01:00
Sebastian Broberg
b000ca4eb7
Boop, logic escaped me also refractor this shit someone.
2015-12-25 11:30:33 +01:00
PsiOmegaDelta
faec92b553
Can now join compatible cable coils of any type.
...
Partial backport of #11656 . Fixes #10935 .
2015-12-25 11:19:59 +01:00
GinjaNinja32
2d5b677a62
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-12-25 03:51:40 +00:00
GinjaNinja32
7cca8416b3
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-12-25 03:41:33 +00:00
GinjaNinja32
04006f5b9e
fix human examine gender
2015-12-25 01:06:35 +00:00
Sebastian Broberg
ebef6272b9
Fixes #11711
...
Should fix it.
2015-12-24 23:02:37 +01:00
Zuhayr
53b2c6be80
Merge pull request #11737 from PsiOmegaDelta/151223-Paralysis
...
Adds a paralyze button for easier administration
2015-12-23 23:28:37 +10:30
PsiOmegaDelta
1e86e42359
Removes jar slime handling, whatever it was supposed to be. Fixes #11689 .
2015-12-23 13:46:31 +01:00
PsiOmegaDelta
70b84d87a6
Tweaks permission rights.
2015-12-23 13:01:03 +01:00
Datraen
65f68602e7
Adds a longer timer to paralyze, allows for other mobs to fall under this proc.
...
Conflicts:
code/modules/admin/admin.dm
2015-12-23 12:57:43 +01:00
Datraen
c5912b988c
Adds a paralyze button for easy administration.
...
Conflicts:
code/modules/admin/admin.dm
2015-12-23 12:56:48 +01:00
PsiOmegaDelta
7123044b3e
Merge pull request #11736 from Baystation12/dev-freeze
...
Dev
2015-12-23 11:38:51 +01:00
PsiOmegaDelta
f54dd94a66
Merge pull request #11735 from Baystation12/master
...
Dev-freeze
2015-12-23 11:33:35 +01:00
Atlantis
9fa1513647
Fixes AI's Examine()
...
- Message about AI's backup power now only show when the AI still lacks external power.
2015-12-23 00:57:54 +01:00
Zuhayr
b6984d9a20
Added checks for character age to numerous jobs.
...
Conflicts:
code/game/jobs/job/assistant.dm
2015-12-22 13:24:12 +01:00
PsiOmegaDelta
a95927d653
Merge pull request #11728 from Baystation12/dev-freeze
...
Dev
2015-12-22 12:08:45 +01:00
PsiOmegaDelta
3cf0a0e182
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-12-22 10:46:55 +01:00
Ccomp5950
9383dfb199
Merge pull request #11719 from Spamcat/devbugs
...
Couple of dev fixes
2015-12-21 15:51:50 -05:00
ccomp5950
5873a92df8
Fixes the icon for numbness.
...
Resolves #11435
2015-12-21 15:30:26 -05:00
Jon
5e73b92bd4
Fixes the general flavour text field.
...
The field was blanking each time it was opened to edit.
2015-12-21 09:13:46 +01:00
Spamcat
597a7723c2
Fixed people being unable to dress up.
...
this bug is 2lewd to stay on server
2015-12-20 21:58:05 +03:00
Spamcat
3dfbffbcd2
Fixes #11681
2015-12-20 20:05:07 +03:00
PsiOmegaDelta
4eb5ff1b87
Buckling and disability check tweaks.
...
Buckling now returns fully buckled if you're restrained, otherwise partially buckled.
Wraps incapacitated(INCAPACITATION_DISABLED) in a proc call to ensure there's is only one place to alter in the future.
2015-12-20 12:03:29 +01:00
PsiOmegaDelta
f6eec096e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_onclick/click.dm
code/game/objects/items/weapons/material/kitchen.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-12-20 11:55:53 +01:00
PsiOmegaDelta
5d3d0c5dc3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
ccomp5950
ce3587d867
Hallucinations no longer burn on the SuperMatter
2015-12-19 21:33:02 -05:00
PsiOmegaDelta
378f62b81e
AI qdel() improvements.
...
AI destruction now cleans up more of its held objects and variables.
Fixes some issues with the AI powersupply qdel().
Fixes #11710 .
2015-12-19 11:45:24 +01:00
Chinsky
9a156c56de
Merge pull request #11513 from Karolis2011/Constructable_Cargo
...
Constructable Cargo
2015-12-19 09:18:45 +03:00
Hubblenaut
28919269ee
Prevents blob from growing over asteroid walls
2015-12-18 07:59:49 +01:00
Zuhayr
740d10d3fc
Fixes colour issues.
2015-12-18 07:58:54 +01:00
ccomp5950
6736fb54e7
Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
2015-12-17 20:25:36 -05:00
Neerti
0e3f37570a
Makes radiation medication not actually irradiate you worse.
2015-12-17 17:56:36 +01:00
Hubblenaut
dce5a70572
Colors on-mob sprites
2015-12-17 17:54:44 +01:00
Hubblenaut
56d8975a19
Tweaks Filtering and Toxic Gases
2015-12-17 17:50:30 +01:00
Zuhayr
64421e35ca
Fixes some overlay issues with aiming.
2015-12-17 17:39:25 +01:00
Jon
d890a4ce30
Removes the else to properly for the switch statement, meaning that it no longer wipes your flavour text/thinks you're opening the general slot ever time.
2015-12-17 17:38:34 +01:00
Atlantis
1edc286cc3
(ANTAG) Adds Revelation Virus
...
- Adds revelation virus, a program that destroys the hard drive on execution. It also has chance of destroying the computer's power supply and/or battery.
- (Added): Simple UI for virus that allows user to rename the program to look like non-malicious one. The virus must be armed first via this UI. Once armed, it will trigger on next execution (even if copied/sent to other system)
- Adds extended description to programs, that contains basic information on what the program is doing.
2015-12-16 16:17:11 +01:00
Spamcat
a515f0469a
Wrenched opwn welding tanks now explode when exposed to fire.
...
#11537
2015-12-16 17:59:05 +03:00
PsiOmegaDelta
f62f24e1ac
Removes Stat() sleep.
...
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.
Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
2015-12-16 13:24:40 +01:00
Chinsky
8413d7bd20
Merge pull request #11682 from Zuhayr/guns
...
Targeting rewrite.
2015-12-16 08:40:21 +03:00
Zuhayr
1ab263f662
Rewrote targeting.
2015-12-16 10:10:13 +10:30
Zuhayr
2da40e525e
Removed targeting.
2015-12-16 10:09:20 +10:30