cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 8 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

1139 Commits

Author SHA1 Message Date
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
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
Zuhayr
d8018db5c9 Finally got things working from vote to roundstart to join to death. 2015-03-21 11:14:59 +10:30
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
Den
a41434331f Add middle mouse button action for buildmode 
Middle Mouse Button on buildmode button= On/Off object type saying"
Middle Mouse Button on turf/obj        = Capture object type"
 2015-03-15 22:22:25 +02:00
volas
5fa66b2a8a Changes to aooc 2015-03-09 22:59:52 +03:00
volas
c7573a0d11 Antag-OOC 2015-03-09 12:19:50 +03:00
volas
2ad8d26aeb Play server sound verb for admins 2015-03-09 12:19:47 +03:00
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
PsiOmega
f0a5dae1c4 Icarus cannon admin logs. 2015-02-20 19:54:15 +01:00
Zuhayr
9c45f000ec Merge with dev. 2015-02-16 20:34:07 +10:30
mwerezak
08635587e1 Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm 
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
 2015-02-14 13:38:05 -05:00
mwerezak
0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite 
Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm
 2015-02-13 01:57:19 -05:00
mwerezak
01798c98b6 Rewrites syringe and dart guns 2015-02-13 01:34:35 -05:00
Zuhayr
c953e279a4 Update from dev. 2015-02-12 23:15:47 +10:30
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
Zuhayr
08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +10:30
mwerezak
ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite 
Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm
 2015-02-10 20:59:22 -05:00
mwerezak
fc6dfb5f1b Ammo magazine and casing update 
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
 2015-02-09 21:32:49 -05:00
SkyMarshal
84c40171e7 The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs. 2015-02-08 04:03:19 -07:00
ccomp5950
a07e0a044f Added buttons back to Mentors 
Before:  Mentors see ahelps they only see ckeys, no links no character names, etc.

Now:  Character names shows up and I've added a mentor specific link bar so mentors can use the buttons they already have easily.
 2015-02-07 00:04:50 -05:00
Zuhayr
c5e2feb5f1 Merge with dev. 2015-02-05 20:24:06 +10:30