cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 6 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

960 Commits

Author SHA1 Message Date
PsiOmega
9d90691605 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
 2015-06-14 10:35:29 +02:00
GinjaNinja32
8d0c7039df Changes to dsay 
- Adds dsay to list of +DEBUG verbs
- Changes dsay to use holder rank rather than trying to guess from rights
 2015-06-13 16:46:03 +01:00
PsiOmega
c2f8e1242e Expands admin jump permissions, cuts down on superfluous feedback. 2015-06-13 08:44:58 +02:00
PsiOmegaDelta
7573ef961c Merge remote-tracking branch 'upstream/dev' into 150609-TrackEye 2015-06-10 11:16:34 +02:00
PsiOmegaDelta
75cffd60aa Merge pull request #9780 from Baystation12/dev-freeze 
Dev
 2015-06-10 11:15:45 +02:00
PsiOmegaDelta
b44da1ee42 Admin JMP now includes a link to EYE or BDY if any. 2015-06-10 11:08:31 +02:00
PsiOmegaDelta
e7faa19ea3 Merge pull request #9779 from Baystation12/master 
Dev-freeze.
 2015-06-10 11:04:54 +02:00
PsiOmega
581c9b1308 Fixes admin jumps. 
Changes the checks and message target around, now targets usr instead of src.
 2015-06-09 20:14:05 +02:00
PsiOmegaDelta
0af1009b50 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-09 12:14:35 +02:00
PsiOmegaDelta
97f49bb982 Merge pull request #9756 from Baystation12/master 
Dev-freeze
 2015-06-09 12:12:40 +02:00
PsiOmegaDelta
ec68454f63 Fixes #9753. 
Being admin jumped or jumping to another location now cancels ghost tracking.
Also adds proper permission checks.
 2015-06-09 08:55:12 +02:00
PsiOmegaDelta
a07d20d657 Ports /tg/'s meteor implementation. 
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
 2015-06-05 14:58:35 +02:00
PsiOmegaDelta
00953968dd Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-04 08:20:00 +02:00
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
PsiOmega
086517f988 Closes a span class. 
Has somehow gone unnoticed until now.
 2015-06-03 17:57:57 +02:00
Chinsky
58d9cb24a2 Merge pull request #9632 from PsiOmegaDelta/150602-Access 
Generalizes access definitions.
 2015-06-02 22:32:11 +03:00
PsiOmegaDelta
88b80732e7 Generalizes access definitions. 
Access description, type, and area/region (medical, security, etc.) is now defined in a datum, ensuring the id modification consoles will (should) never be missing entries.
 2015-06-02 18:11:46 +02:00
PsiOmegaDelta
fcb0841646 Reduction of admin right-click verbs. 
Removes verbs which only works on specific mob types from the admin right-click context.
Fixes #9627.
Fixes #9628.
 2015-06-02 14:20:14 +02:00
PsiOmegaDelta
4a976e1ee2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-02 13:13:40 +02:00
PsiOmega
0aade86d5f Admin PM replies now sent to IRC. 
Now both ahelps and their replies should be sent to an IRC channel, if configured.
 2015-06-01 19:43:54 +02:00
Atlantis
97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00
Zuhayr
150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
Zuhayr
f4923e2a20 Renamed twohanded weapons, collapsed bats. 2015-05-16 21:12:54 +09:30
Zuhayr
a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
Zuhayr
a9f936fe42 Added exosuit customisation kits to cargo. 2015-05-13 11:20:54 +09:30
Atlantis
152156018a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-11 07:46:51 +02:00
Mloc
16d50c645d new object-based lighting system 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:25 +01:00
PsiOmegaDelta
928b0a8be5 Merge pull request #9162 from volas/admin_stuff3 
Admin dice
 2015-05-10 10:11:29 +02:00
volas
a0f119b9dc Admin dice 2015-05-10 10:11:07 +03:00
volas
84696567d8 Ability to select job equipment in 'Select Equipment' 2015-05-09 19:29:26 +03:00
PsiOmega
b6501998e3 Ensures only antags and admins can see AntagOOC. 
Adds rights check, not only holder verification.
 2015-05-06 11:34:54 +02:00
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
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
Chinsky
940b5c8c62 Merge pull request #8891 from volas/sanitize3 
sanitize() 3
 2015-04-19 14:59:36 +03:00
volas
dbd239f4ec Corrections dual sanitizing 2015-04-18 17:49:25 +03: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
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
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
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
1b4e13aabc Removes unnecessary and cruft procs from mob/inventory.dm 2015-03-30 05:28:09 -04:00
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
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