cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,963 Commits 6 Branches 0 Tags
e7d85f8edc7a38caccfd3e82a2fbba9c36595fa1
Commit Graph

1023 Commits

Author SHA1 Message Date
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
PsiOmega
a6a428af6a Mecha + misc. Destroy() because I had already begun. 2015-04-17 09:55:59 +02:00
Zuhayr
7129feb417 Removed some cocked up files. 2015-04-13 22:58:32 +09:30
Zuhayr
a029f88cfc Added construction drone variant, updated the construction area map slightly. 2015-04-11 19:20:13 +09:30
Chinsky
7b15bd59e5 Merge pull request #8768 from Yoshax/emergencymessage 
Emergency message changes
 2015-04-09 08:15:19 +03:00
Mustafa Kalash
177d968933 Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first. 2015-04-06 18:40:11 -04:00
Yoshax
5a34b1481b Big emergency message changes 2015-04-06 20:17:18 +01:00
PsiOmega
8e55ad8114 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/mob.dm
 2015-04-03 09:33:05 +02:00
Mustafa Kalash
1a614c12de Switches hacky list copying method in check_items and check_fruit to use Copy(). Uses Cut() to make sure that one item does not satisfy the need for multiple items of the same type. 2015-04-01 11:41:46 -04:00
=
601e6fb7ef Merged with dev. 2015-03-31 11:17:13 +10:30
Chinsky
a8ee3ca25e Merge pull request #8560 from PsiOmegaDelta/PCAILaws 
PC AI laws.
 2015-03-30 21:23:34 +03:00
Zuhayr
2f60c4b82d Merge pull request #8638 from Zuhayr/vox 
Removes the vox armalis.
 2015-03-30 08:56:34 +10:30
=
d77010221c Merge with dev. 2015-03-30 08:36:52 +10:30
=
6a6e09b15c Updating the organ addition proc. 2015-03-30 08:19:30 +10:30
PsiOmega
710abd0921 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/spells/mind_transfer.dm
 2015-03-29 16:23:06 +02:00
PsiOmegaDelta
84e4f6315f Merge pull request #8660 from Baystation12/master 
Dev-freeze
 2015-03-29 16:19:38 +02:00
PsiOmega
5b8f055595 Merge remote-tracking branch 'upstream/dev' into PCAILaws 
Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
 2015-03-28 20:26:24 +01:00
Zuhayr
0c3a18b0b6 Merge pull request #8380 from volas/sanitize_procs 
[DNM] sanitize() and text.dm refactoring
 2015-03-29 00:57:33 +10:30
mwerezak
09fea22231 Fixes camera wires 
Seems like pulsing was mistakenly set to deactivate the camera during the wire datum update.
 2015-03-27 23:35:38 -04:00
Zuhayr
8f242740a8 Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs. 2015-03-28 11:01:11 +10:30
PsiOmega
633db48082 Wizard mind transfer attack log. 
Adds an attack log for the wizard mind transfer.
 2015-03-27 09:08:09 +01:00
Zuhayr
c5d42f3a4b More work on severing, improvements to yank-out-object. 2015-03-27 17:51:10 +10:30
Zuhayr
59adbae59e Removes the vox armalis. 2015-03-27 16:41:32 +10:30
Zuhayr
aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +10:30
Zuhayr
16b2c9cab8 Fixes a minor thing with vox. 2015-03-26 15:54:29 +10:30
PsiOmega
41d3642813 Changes the silicon is_malf/is_traitor procs to utilize the new antag datums. 2015-03-25 19:27:03 +01:00
volas
5fee41d4ba sanitize() refactor: third pass (misc) 2015-03-25 01:05:21 +03:00
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
Zuhayr
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
PsiOmega
e0538df294 Changes the silicon is_malf/is_traitor procs to utilize the new antag datums. 2015-03-22 17:43:20 +01:00
PsiOmega
59ec34e410 Merge remote-tracking branch 'upstream/dev' into PCAILaws 2015-03-22 17:26:09 +01:00
PsiOmega
470766e301 Moves silicon law logging to a more all-catching location. 2015-03-22 14:11:44 +01:00
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
PsiOmega
744ef41d8e Law Zero phrasing is now a config option. 
The default value is a non-objective phrasing. config.txt contains the default phrasing should it be desired.
 2015-03-17 14:47:32 +01:00
Chinsky
d2518798ec Merge pull request #8486 from PsiOmegaDelta/NanoLaws 
NanoUI - Silicon law manager
 2015-03-17 14:24:30 +03:00
Chinsky
158a2731e3 Merge pull request #8335 from GinjaNinja32/reagent_dispenser 
Reagent dispenser rework
 2015-03-17 10:05:18 +03:00
Chinsky
376657bdd7 Merge pull request #8353 from Glloyd/goonschedu 
Goon Process Scheduler for BS12
 2015-03-17 10:04:21 +03:00
PsiOmega
7f68403ae4 NanoUI - Silicon law manager 
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
 2015-03-17 07:22:02 +01:00
GinjaNinja32
458970a617 Merge remote-tracking branch 'upstream/dev' into reagent_dispenser 2015-03-16 21:21:56 +00:00
PsiOmega
ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
 2015-03-13 09:23:26 +01:00
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
PsiOmega
533ccef0ab Robot code clean up and fixes. 
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
 2015-03-10 13:37:20 +01:00
mwerezak
645910947b Adds orderable flaregun crate 
Mainly to make double-barrelled shotguns orderable.
 2015-03-09 16:00:49 -04:00
mwerezak
b9d2517d83 Tweaks random gun spawners and supply packs 
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
 2015-03-09 15:47:25 -04:00
PsiOmega
3e9f33136a Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/effects/decals/Cleanable/fuel.dm
	maps/exodus-5.dmm
 2015-03-05 09:20:20 +01:00
PsiOmega
173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm
 2015-03-05 08:05:44 +01:00
Graham Lloyd
7420463f73 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-03-04 05:15:27 -05:00
Graham Lloyd
160183ebd5 finishes work on adapting the goon process scheduler for BS12. 2015-03-04 05:14:36 -05:00
PsiOmega
05c487ca8f Fixes NanoUI transfer runtime. 
No longer unconditionally attempts to transfer NanoUIs from one mob to another.
Previously caused runtimes if the source-mob was gibbed or otherwise destroyed.
 2015-03-04 09:46:49 +01:00