Commit Graph

1176 Commits

Author SHA1 Message Date
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
PsiOmegaDelta
7d7aa4b50b Turns events into vars instead of a list, to greatly simplify qdel() cleanup. 2015-12-14 13:44:05 +01:00
Chinsky
36803747a2 Merge pull request #11445 from Kearel/fluff2
[FEATURES] Adds entertainment items
2015-12-12 16:49:01 +03:00
Kearel
9450680b1c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-10 13:04:52 -06:00
PsiOmegaDelta
d43cf313c0 Relocates color definitions. Lowercases color definitions. 2015-12-09 21:49:58 +01:00
PsiOmegaDelta
b2720a8c6c Fixes sparks causing runtimes on pooling. 2015-12-09 20:41:55 +01:00
PsiOmegaDelta
abcd965dde Now possible to change cable coil color using a multitool.
Obviously using the same methods that borgs use to change the cable coil color internally.
2015-12-09 20:20:28 +01:00
Chinsky
60e785da97 Merge pull request #11458 from PsiOmegaDelta/151117-MultitoolPower
Multitool Upgrade
2015-12-09 21:34:12 +03:00
GinjaNinja32
1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00:00
Kearel
7b2b658644 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-07 11:43:51 -06:00
PsiOmegaDelta
2402b3ccd8 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 2015-12-07 17:56:27 +01:00
Neerti
1851af1031 Infinite recursion radio hacking fix.
Fixes #11618.
2015-12-07 11:34:42 +01:00
PsiOmegaDelta
12fb0bdb10 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/modules/nano/nanoui.dm
2015-12-06 12:10:33 +01:00
PsiOmegaDelta
b89e19e5a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev.
Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml
2015-12-06 11:48:20 +01:00
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
PsiOmegaDelta
39f0fcebaa Extension additions and multitool menu tweaks.
Relocates obj extension code to the extension file.
Adds a support method, set_extension, to ensure that proper cleanup occurs in the case of multiple additions to the same extension type.
The default multitool menu title is now much shorter.
The cloning computer multitool menu now lists all connected cloning pods.
2015-12-05 22:51:41 +01:00
Kearel
caa0fbaea5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-05 12:47:03 -06:00
PsiOmegaDelta
da080df765 Fixes records unintentionally referencing each other.
Because of the limitations of BYOND's bitwise operators (which affect both the old and new implementations of num2hex()), you cannot use numbers larger than 2^16 with that proc.
Manual port of https://github.com/PolarisSS13/Polaris/pull/430.
2015-12-05 09:25:56 +01:00
PsiOmegaDelta
416c24f3e2 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 2015-12-04 11:20:39 +01:00
Raptor1628
2cd5a49498 Security Gear II
Collection of Security changes:

New heavy vest sprites, replacing the old toggle system.
New helmet sprites.
Heavy vests reduced to 2 pockets.
Regular vests have no pockets.
Holobadge sprite change and badge addition for HoS/Warden.
Teargas Grenades, replace flashbangs in vendor and officer lockers,
flashbangs located in armory and with warden.
Detective 1911 starts with flash magazine, has one rubber magazine in
locker.
Rubber bullet damage halved to reduce frequency of bone breakage and IB.
Flash bullet buffed to cause small halloss.
Armory loadout changed to static 4 e-guns, 4 laser guns, 2 ion rifles, 2
shotguns starting loaded with beanbags, 4 Mk 58s loaded with flash
rounds.
Tactical armor removed, still available in cargo.
Sub-Armory restored to warden access only, officer access storage rack
added.
Now with Changelog.

Threads and Polls located here:

http://baystation12.net/forums/threads/discussion-poll-security-energy-weapons-antag-projectile-weapons.932/

http://baystation12.net/forums/threads/discussion-poll-detective-weapon.865/
http://baystation12.net/forums/threads/discussion-armory.792/

http://baystation12.net/forums/threads/discussion-security-vest-and-helmet.790/

Quick Fix

	modified:   code/datums/supplypacks.dm
	modified:   code/game/machinery/vending.dm
	modified:   code/game/objects/items/devices/uplink_items.dm
	modified:   code/game/objects/items/weapons/grenades/chem_grenade.dm
	modified:   code/game/objects/items/weapons/storage/boxes.dm
	modified:   code/game/objects/structures/crates_lockers/closets/secure/security.dm
	modified:   code/modules/clothing/suits/armor.dm
	modified:   code/modules/clothing/suits/storage.dm
	modified:   code/modules/clothing/under/accessories/badges.dm
	modified:   code/modules/projectiles/guns/projectile/pistol.dm
	modified:   code/modules/projectiles/projectile/bullets.dm
	modified:   code/modules/projectiles/projectile/energy.dm
	modified:   code/modules/random_map/drop/drop_types.dm
	new file:   html/changelogs/Raptor1628-Dev.yml
	modified:   icons/mob/belt.dmi
	modified:   icons/mob/head.dmi
	modified:   icons/mob/suit.dmi
	modified:   icons/mob/ties.dmi
	modified:   icons/obj/clothing/hats.dmi
	modified:   icons/obj/clothing/suits.dmi
	modified:   icons/obj/clothing/ties.dmi
	modified:   maps/exodus-1.dmm
	modified:   maps/exodus-2.dmm
2015-12-02 13:42:41 -05:00
Kearel
5cc2944733 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-11-28 11:21:07 -06:00
PsiOmegaDelta
e9d8e89725 The multitool now properly releases its buffer reference when the buffer is destroyed. 2015-11-23 09:39:38 +01:00
PsiOmegaDelta
50fb4a8de7 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/game/objects/items/devices/multitool.dm
2015-11-23 08:57:12 +01:00
Zuhayr
9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30
PsiOmegaDelta
79016f6d44 It is now possible to use a multitool to configure alert console circuits, and the available alarm sources. 2015-11-21 15:10:29 +01:00
Chinsky
f9e56ddb18 Merge pull request #11349 from PsiOmegaDelta/151023-Wires
Converts the nuclear bomb to the new wire system.
2015-11-19 10:11:13 +03:00
PsiOmegaDelta
47ece50813 Allows the AI to utilize its multitool where applicable. 2015-11-18 11:01:08 +01:00
PsiOmegaDelta
8a4250ddcd Can now connect cryo pods and computers with each other using the new multitool methodology.
Also cleans up Destroys().
2015-11-17 22:58:10 +01:00
PsiOmegaDelta
6370705c02 Multitool menu.
Begins work on allowing the multitool to modify and alter more equipment than ever.
2015-11-17 19:42:41 +01:00
PsiOmegaDelta
9e321ff6d5 Updates the nuclear bomb code and makes it utilize NanoUI, ported from Paradise. 2015-11-15 13:08:42 +01:00
Kearel
a8406f018b Adds Entertainment Items
Adds the following:
Actor Guild for ghosts to spawn at.
Board for playing board games.
Two trading card games with booster packs.
Tarot cards.
Cargo can now supply lasertag equipment as well as decks/booster packs
2015-11-12 23:24:34 -06:00
PsiOmegaDelta
ffbac82f91 Fixes map conflicts, updates changelog. 2015-11-10 10:46:22 +01:00
PsiOmegaDelta
94bb1e12d4 Merge pull request #11283 from Sligneris/patch-1
Overhaul of NT Default
2015-11-10 10:36:14 +01:00
Chinsky
5acf5f1b7b Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup
Character setup refactor.
2015-10-26 05:44:13 +03:00
PsiOmegaDelta
dc563c58bd Converts the nuclear bomb to the new wire system. 2015-10-23 18:58:57 +02:00
Zuhayr
1244c4a5fd Porting forensics from Aurora. 2015-10-24 02:15:06 +10:30
PsiOmegaDelta
e116721977 Character setup refactoring.
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.
2015-10-18 17:34:35 +02:00
Zuhayr
5dc6ff5da1 Merge pull request #11230 from PsiOmegaDelta/xenomorphs
Xenomorph update
2015-10-13 08:31:27 +10:30
Sligneris
4984b0e7da Update NT Default lawset 2015-10-12 23:47:28 +02:00
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
2015-10-11 17:37:01 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
2015-10-11 17:17:41 +02:00
PsiOmegaDelta
13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs
Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm
2015-10-10 12:05:36 +02:00
Hubblenaut
80cc83dbf8 Fixes backup power test light 2015-10-09 17:44:30 +02:00
Hubblenaut
a7cad04264 Amendments to light replacer and janitor supply crate 2015-10-06 19:59:56 +02:00
PsiOmegaDelta
8eee143177 Merge remote-tracking branch 'upstream/dev' into xenomorphs
Conflicts:
	baystation12.dme
2015-10-01 09:48:51 +02:00
PsiOmegaDelta
9dd1a54191 Destroy tweaks.
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
Zuhayr
22ef779f65 Cherrypicked xenophage-rewrite mechanics over. 2015-09-21 20:36:45 +09:30
GinjaNinja32
be2279106f Merge remote-tracking branch 'upstream/dev' into vv
Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/admin/view_variables/topic.dm
2015-09-10 03:06:27 +01:00
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
Chinsky
7d123549ed Merge pull request #10845 from PsiOmegaDelta/150824-Cargonia
Cargo now sorts under their own department in manifests.
2015-09-03 20:38:00 +03:00