cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 5 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

1897 Commits

Author SHA1 Message Date
ccomp5950
7436573177 Fixes the removal of all organs when admins use "Select Equipment" 
fixes #8884
 2015-05-05 21:37:28 -04:00
Atlantiscze
024dabef7b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-05 22:13:58 +02:00
PsiOmega
151c5204ee Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml
 2015-05-05 08:11:28 +02:00
volas
7ff68f8757 Modification to 'cinematic' command 2015-05-04 12:10:59 +03:00
PsiOmega
82a8f32783 Admins can now toggle LOOC separately from OOC. 
Also includes what I image to be proper permission checks for toggling the various OOC channels.
 2015-04-30 09:52:29 +02:00
Zuhayr
cc19bbb604 Merge pull request #8972 from DeeUnderscore/paper-functionality 
Paper functionality additions
 2015-04-29 02:46:21 +09:30
Daranz
8b792b6361 Merge branch 'dev' into paper-functionality 2015-04-27 12:37:31 -04:00
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
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
Daranz
1bd25c54e3 Add random access inserting into paper bundles 
You can now insert papers into paper bundles by clicking on the next page or
previous page link with a sheet of paper in hand.

The bundle window also now correctly updates when the bundle is in a folder.
 2015-04-23 21:49:56 -04:00
mwerezak
5b037670b3 Removes most instances of item_color 
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
 2015-04-22 17:40:27 -04:00
Chinsky
940b5c8c62 Merge pull request #8891 from volas/sanitize3 
sanitize() 3
 2015-04-19 14:59:36 +03:00
Zuhayr
243157d339 Merge pull request #8894 from PsiOmegaDelta/CleanStart 
Clean server start.
 2015-04-19 03:17:29 +09:30
volas
dbd239f4ec Corrections dual sanitizing 2015-04-18 17:49:25 +03:00
Chinsky
9d6ff2f939 Merge pull request #8865 from PsiOmegaDelta/Adminery 
Ensures Admin Delete uses qdel.
 2015-04-18 16:56:40 +03:00
PsiOmega
eca7569077 Clean server start. 
Server start messages concerning initialization, object generation, etc. is now only propagated to users with R_DEBUG access.
 2015-04-18 15:32:25 +02:00
PsiOmega
d3b000f2cc Ensures Admin Deletes uses qdel. 
Ensures that Destroy() is properly called, for types implementing it.
 2015-04-16 12:56:24 +02:00
PsiOmega
d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +02:00
PsiOmega
a6a9cb76e8 Ghost-possession sanity checks. 
Adds sanity checks referred to in #8849.
 2015-04-15 16:10:36 +02:00
PsiOmega
f9b3547e8d Allow admins to drag-drop ghosts into mobs. 
This functions the same way as editing the ckey in vv.
Has the same permission check as assume-direct-control.
It requires the admin also be a ghost to avoid conflicts with other drag drop code.
 2015-04-15 08:49:00 +02:00
PsiOmega
1511e2b3f4 Ports /vg/'s Nas-Sie remake. 
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
 2015-04-12 16:19:16 +02:00
Chinsky
7a40d193fe Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen 
Refactors NanoUI interaction (again)
 2015-04-11 04:43:50 +03:00
PsiOmega
49d3f0fcf7 Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen 2015-04-10 15:49:36 +02:00
PsiOmega
e37c5c22d4 Refactors NanoUI interaction (again) 
Takes NanoUI interaction code and splits it into more manageable modules.

The default handler that checks distances, camera coverage, etc., etc.
Admin NanoUI windows now only check for admin rights, ignoring sight, distance, and anything else.
ERT/mercenary appearance changer now remains open for as long as the mob remains on the admin Z-level.
PDAs and uplinks now require that you keep the item somewhere in your main inventory (or contents to be precise). Hands or ears are fine, inside bags are not.
Rig suits also check that they are in the operator's inventory or that the synthetic operator is somewhere within the suit's contents (recursively).
 2015-04-10 11:19:38 +02:00
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
Chinsky
7b15bd59e5 Merge pull request #8768 from Yoshax/emergencymessage 
Emergency message changes
 2015-04-09 08:15:19 +03:00
PsiOmega
71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
 2015-04-08 10:55:26 +02:00
PsiOmega
66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/cult/runes.dm
 2015-04-08 10:40:38 +02:00
Yoshax
d78ae0d509 Merge branch 'aiemergencymessage' into emergencymessage 2015-04-06 20:19:27 +01:00
Yoshax
b69ab10da0 Merge branch 'dev' into aiemergencymessage 2015-04-05 17:39:30 +01:00
PsiOmega
d3a1ddfa09 Thermal/NVG changes. 
Thermals/NVGs can now be toggled on/off from the GUI action bar, same as mesons.
Adds charge sound for special goggles.
 2015-04-05 09:54:55 +02:00
volas
f74fc1a2bd Fix checking in paranoid mode for debug verbs 2015-04-04 16:30:28 +03:00
Atlantiscze
4e2769710b Initial Newmalf port 
- Ports TSA Newmalf code.
- Complete overhaul of Malfunction. New modular abilities, 12 of which are in game by default.
- Adds AI hardware. AI may have only one piece and it gives unique boost in certain area (turrets strength, secondary power supply, etc.)
- Adds hardware drivers - these abilities control AI's hardware such as the APU power supply or self destruct explosives.
- Station overtake was changed to "hack all APCs" ability instead. When completed self-destruct is unlocked. Timer for station self destruct increased to 2 minutes. AI may activate/deactivate the self destruct at will.

Please bear in mind this is only INITIAL COMMIT. More commits are to follow. Minimal player count is now set to 1 but will be 2 when finished.
 2015-04-03 23:00:29 +02: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
Chinsky
76ef8c710c Merge pull request #8689 from PsiOmegaDelta/SecLevels 
Allows admins to more easily set security levels.
 2015-04-02 23:43:26 +03:00
Yoshax
61691a9603 Adds emergency message for AI 2015-04-02 21:09:48 +01:00
Yoshax
25fa1a2258 Adds feedback and logging for free job slot. 2015-03-31 19:01:17 +01:00
PsiOmega
c4a10f05b1 Allows admins to more easily set security levels. 
Also alters the sound for code delta.
 2015-03-31 14:32:28 +02:00
mwerezak
398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/modules/organs/organ_external.dm
 2015-03-31 02:13:22 -04:00
Chinsky
65f61122b5 Merge pull request #8604 from Zuhayr/limbs 
Limb objects, severing and cybernetics
 2015-03-31 08:38:54 +03:00
mwerezak
9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
 2015-03-31 01:37:55 -04:00
mwerezak
9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2015-03-31 00:16:56 -04:00
mwerezak
cdfce64ad0 Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate. 2015-03-30 22:05:00 -04:00
mwerezak
1b4e13aabc Removes unnecessary and cruft procs from mob/inventory.dm 2015-03-30 05:28:09 -04:00
=
d77010221c Merge with dev. 2015-03-30 08:36:52 +10:30
mwerezak
ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04: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
Zuhayr
aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +10:30
Zuhayr
139edb4f9b Fixed up some boilerplate. 2015-03-26 23:24:56 +10:30