PsiOmegaDelta
afd526126d
Fire extinguisher fixes and tweaks
...
Port of https://github.com/PolarisSS13/Polaris/pull/713 .
2016-01-08 14:47:18 +01:00
PsiOmegaDelta
f9b61ed1ec
Merge pull request #11943 from Baystation12/dev-freeze
...
Dev
2016-01-08 14:27:32 +01:00
Ccomp5950
97c0635fad
Merge pull request #11927 from comma/devfix
...
Devfixes
2016-01-07 13:03:26 -05:00
Hubblenaut
cd0a1221d5
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2016-01-07 14:37:18 +01:00
Chinsky
bc390c5603
Fixes #11914
2016-01-07 05:49:16 +03:00
PsiOmegaDelta
39bbca416a
Adds missing istype() check before the secure brief case emag check.
...
Fixes #11900 .
2016-01-06 18:31:39 +01:00
Hubblenaut
e1f58161ac
Diverse Police Tape fixes/tweaks
2016-01-05 19:14:18 +01:00
RavingManiac
a8cea3862d
Backpack and box storage capacity set to 16 and 8 respectively. Maximum w-class set to 4 and 3 respectively.
...
Storage box sprite made lighter to improve visibility against dark backgrounds.
2016-01-05 22:26:15 +08:00
RavingManiac
6e82dfa381
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2016-01-04 19:25:36 +08:00
Ccomp5950
7dc9b3487a
Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
...
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
Karolis2011
3076884f6e
Adds new modular ID modification console and
...
removes old console. This commit won't compile.
2015-12-31 13:17:31 +02:00
PsiOmegaDelta
96cbc225ff
Bags with the auto-pickup ability can no longer grab anchored objects.
...
Also fixes the canUnEquip() proc. It now only checks state, it doesn't change it. Fixes #11819 and probably a couple other odd item interactions.
2015-12-30 11:28:54 +01:00
Atlantis
605b78d377
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2
2015-12-29 20:25:34 +01:00
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
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
Sebastian Broberg
90f27ca42c
Fixes chemgrenades
...
Fixes #11686
2015-12-23 23:46:53 +01:00
PsiOmegaDelta
8ce1b47943
Using the multitool on equipment now adds a set of fingerprints.
2015-12-23 13:33:52 +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
c78f98754a
Utensils now respect the lack of mouths, and has a delay on feeding others.
2015-12-20 11:46:42 +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
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
Spamcat
905070bc96
\the
2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318
\red >> styles
2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45
Made kitchen utensils less dangerous.
...
#11370
2015-12-16 20:07:35 +03:00
Spamcat
f2ac9a023b
pAIs no longer see custom emotes twice.
...
fuck i spent way too much time on a single line fix
2015-12-16 19:36:14 +03:00
Chinsky
8413d7bd20
Merge pull request #11682 from Zuhayr/guns
...
Targeting rewrite.
2015-12-16 08:40:21 +03:00
Chinsky
10c2490719
Merge pull request #11688 from PsiOmegaDelta/151214-Hacktool
...
The hacking tool item can now be bought through the Antag Uplink.
2015-12-16 08:31:47 +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
Atlantis
326922cd8d
NTNet Relay upgrades
...
- NTNet Quantum Relays now have simple UI that allows users to manually toggle them on/off.
- Implements simplified Denial of Service handling for relays. This will be used by next commit that will add antagonist software.
- Relays can buffer and dissipate certain amount of DoS traffic. If this traffic exceeds certain level (configurable via varedit) the relay crashes temporarily.
- Relays may be manually reset by using specific button in the UI
- Relays are now buildable. They are relatively cheap (circuit board and some cables), but the board requires Data Theory 4 research.
2015-12-15 16:13:17 +01:00
PsiOmegaDelta
1a8fc50f1e
Removes suicide code.
2015-12-14 15:57:56 +01:00
PsiOmegaDelta
7d7aa4b50b
Turns events into vars instead of a list, to greatly simplify qdel() cleanup.
2015-12-14 13:44:05 +01:00
PsiOmegaDelta
6b5d237c46
The hacking tool item can now be bought through the Antag Uplink.
2015-12-14 09:56:55 +01:00
PsiOmegaDelta
bbe65baf5c
Merge remote-tracking branch 'upstream/dev' into 151210-TapeTape
...
Conflicts:
code/__defines/misc.dm
2015-12-13 11:50:06 +01:00
PsiOmegaDelta
eda4a5d595
Adds tape to medical, and excavation lockers.
...
Also maps in some EMT medical tape, corrects some badly rotated intercoms, and pixel shifts the large sinks properly.
2015-12-13 11:48:29 +01:00
PsiOmegaDelta
12078c48e9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/mobs.dm
code/game/asteroid.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/recycling/disposal.dm
2015-12-13 10:47:33 +01:00
PsiOmegaDelta
f382626075
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/asteroid.dm
code/game/verbs/ooc.dm
code/modules/admin/verbs/icarus.dm
code/modules/mob/living/silicon/robot/robot_items.dm
code/modules/projectiles/projectile/special.dm
code/modules/random_map/random_map.dm
code/setup.dm
2015-12-13 10:15:29 +01:00
SkyMarshal
415f78ee18
Chem grenades are no longer melted by acid.
...
Fixes #10478
2015-12-12 16:29:05 -07:00
Chinsky
36803747a2
Merge pull request #11445 from Kearel/fluff2
...
[FEATURES] Adds entertainment items
2015-12-12 16:49:01 +03:00
PsiOmegaDelta
f74bd5e1d9
Observer fixups.
...
Adds a proper proc for raising events.
Now only creates the observer lists when an object registers itself.
Multitools now unregister themselves properly from buffers on Destroy().
2015-12-12 12:06:05 +01:00
Hubblenaut
3127ee28b5
Fixes subcategories of floor tiles not being placable
2015-12-11 11:08:36 +01:00
PsiOmegaDelta
6ab585fbf2
Adds research and medical tape.
...
To cordon dig sites, major medical incident areas, etc.
2015-12-11 08:45:55 +01:00
Kearel
9450680b1c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2
2015-12-10 13:04:52 -06:00
Zuhayr
f1630108db
Fixes #10915
2015-12-10 10:32:35 +10:30
Chinsky
60e785da97
Merge pull request #11458 from PsiOmegaDelta/151117-MultitoolPower
...
Multitool Upgrade
2015-12-09 21:34:12 +03:00
Chinsky
2e5547daec
Merge pull request #11642 from GinjaNinja32/indentation
...
Travis now checks incorrect indentation of absolute paths
2015-12-09 21:32:17 +03:00
GinjaNinja32
1921c35231
fix issues with indented absolute path definitions
2015-12-09 14:12:54 +00:00
Chinsky
c9542be1ce
Merge pull request #11630 from PsiOmegaDelta/151207-RotationalIcons
...
Rotational icons
2015-12-09 11:08:24 +03:00
PsiOmegaDelta
185faaeb82
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/game/turfs/turf.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/mob_grab_specials.dm
2015-12-08 08:23:10 +01:00
