cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,256 Commits 5 Branches 0 Tags
5fa66b2a8afcc9cbc52730096ff26f596aa38a85
Commit Graph

1434 Commits

Author SHA1 Message Date
volas
5fa66b2a8a Changes to aooc 2015-03-09 22:59:52 +03:00
volas
e4e8ef3392 Merge remote-tracking branch 'upstream/dev' into admin_stuff 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2015-03-09 18:11:10 +03:00
volas
a9b30da7cc Small correction 2015-03-09 16:53:08 +03:00
volas
ca07914424 Ability to search bans by bantype 2015-03-09 15:15:08 +03:00
volas
59a113f91c Ability to search bans by ip and id, and also matches 2015-03-09 15:12:51 +03:00
errorage
64d6012399 Added the ability to define the ip and computer id for a manual ban (in the banning panel). This is so mirroring bans or banning people who were not online during the round in progress does not require admins to spawn a mob, set their variables and then ban the mob. 
If however an admin attempts to add a manual ban for a player who was present during the current round, a player who still has a mob somewhere in the game world, the proc will prioritize the mob's ip and computer id variables, not the things entered in the banning panel form.
 2015-03-09 15:08:47 +03:00
Chinsky
d8c2a36f9f Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance 
Mirror and ERT appearance improvement.
 2015-03-09 13:42:19 +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
PsiOmega
44c7b2367a Admin verbs and white/blacklisting or races. 
Makes it possible for admins to bring out the appearance changer at will, controlled either by themselves or the mob in question.
Makes it possible to define custom race white/blacklisting in the appearance changer. However, this does not override the player's own racial restrictions.
 2015-03-08 12:25:34 +01:00
Zuhayr
1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +10:30
ccomp5950
ebabf53c6d Staff now have a "re-admin self" button after de-admining themselves. 
Stores their admin datum in a deadmin_holder variable in the client, and just moves it back upon re-admining.
 2015-03-05 11:05:58 -05:00
PsiOmega
df689a4f72 Increased check_rights flexibility. 
NanoUI interfaces no longer appear locked when admin observers look at them for too long.
 2015-03-01 15:29:17 +01:00
PsiOmega
7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm
 2015-02-27 09:06:48 +01:00
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
GinjaNinja32
e47c45591c Fixes a few issues with noise-language. 2015-02-23 18:58:41 +00:00
mwerezak
3ae3ef7961 Merge remote-tracking branch 'upstream/dev' into runtime 2015-02-22 21:13:20 -05: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
69284990a3 Merge remote-tracking branch 'upstream/dev' into runtime 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm
 2015-02-15 22:24:36 -05:00
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
402987edc3 Merge with dev. 2015-02-07 14:44:55 +10:30
Chinsky
3384f13a31 Merge pull request #8029 from GinjaNinja32/viro 
Virology rework
 2015-02-06 00:18:13 +03:00
Chinsky
abd3396a13 Merge pull request #8041 from PsiOmegaDelta/SetMyName 
Silicons can now more easily be correctly renamed.
 2015-02-06 00:15:07 +03:00
Zuhayr
c5e2feb5f1 Merge with dev. 2015-02-05 20:24:06 +10:30
Zuhayr
5890fa3c4b Added plant controller. 2015-02-05 15:53:20 +10:30
Ravensdale
7d502aa255 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 07:40:20 -08:00
Chinsky
f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks 
Adds drying racks, tobacco, and updates pipes
 2015-02-04 18:15:13 +03:00
Ravensdale
fcb2770004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 05:15:23 -08:00
PsiOmega
1a1bf4a718 Silicons can now be easily renamed. 
Moves the AI SetName proc down silicon level.
 2015-02-04 09:48:30 +01:00
Zuhayr
11ec632c22 Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap 2015-02-04 11:03:44 +10:30
Zuhayr
fdf0360a69 Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP. 2015-02-04 10:55:33 +10:30
Zuhayr
09e4be2b1b Collapsed space vines, glowshrooms and biomass into one spreading-plant system. 2015-02-04 10:49:41 +10:30
Zuhayr
43802dceb7 Removed TRAIT_LIFESPAN. 2015-02-04 10:49:30 +10:30
Zuhayr
78e61d9ccd Tweaks to xenoflora, added plant icons and colours to all plants. 2015-02-04 10:42:39 +10:30
Zuhayr
b791c92c6e Added a fruit spawning debug proc. 2015-02-04 10:37:40 +10:30
Ravensdale
2e275d7e5e Area cleanup part 1: Engineering Department 2015-02-03 14:50:11 -08:00
Kelenius
536388978f Conflict fix 2015-02-03 20:57:16 +03:00
Kelenius
0e7ed6aef4 Merge branch 'dev' into ofDryingAndRacks 2015-02-03 20:51:27 +03:00
GinjaNinja32
c4788ad6f5 Merge remote-tracking branch 'upstream/dev' into viro 
Conflicts:
	code/modules/virus2/disease2.dm
 2015-02-03 15:33:37 +00:00