cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 8 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

1498 Commits

Author SHA1 Message Date
Kelenius
df5a0d7941 Mob inventory cleanup 
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
 2016-03-24 01:23:08 +03:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Yoshax
5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +00:00
Datraen
996ce92f7f Merge pull request #1184 from Yoshax/510prep 
Ports Byond 510 preperations from Bay
 2016-03-20 13:45:40 -04:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup 
Changes types of ghosts and eyes
 2016-03-18 13:50:47 -04:00
Yoshax
9f4ff63d11 Makes being muted from something more visible 2016-03-16 20:29:18 +00:00
Yoshax
8be10d96dd Ports Byond 510 preperations from Bay 
Updates comment

Updates supply file
 2016-03-14 18:21:44 +00:00
Kelenius
3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Kelenius
974a2a8216 Removes splash code 
Unused
 2016-03-10 10:55:35 +03:00
Kelenius
acc78a8000 Changes types of ghosts and eyes 
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
 2016-02-20 15:36:05 +03:00
Zuhayr
cbc506fd51 Removed xenomorphs. 2016-02-20 11:50:18 +10:30
Kelenius
f106b3f26b Removes cloaking device 
Adminspawn-only device that is never used, but every time a human
updates icons, they check if they have one. Neat!
 2016-02-08 14:28:54 +03:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16 Merge pull request #810 from Zuhayr/bayupdate 
Bay update.
 2016-02-05 23:21:07 -05:00
Kelenius
b86c730695 Removes the old virus system 
Appendicitis moved to appendix organ
 2016-01-27 11:44:41 +03:00
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Datraen
0c4c3b7add Gives mods AOOC, fixes AUTOAUTOTRAITOR. 2016-01-05 18:12:56 -05:00
Datraen
c19d735e7b Adds more accesses to things. 2016-01-02 22:19:44 -05:00
Datraen
f3a60c054c Gives mods access to direct narrate. 2016-01-02 21:25:09 -05:00
Datraen
0b4ed44ce4 Fixes admin verb, also adds changelog. 2015-12-22 15:09:28 -05:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
 2015-12-13 10:15:29 +01:00
SkyMarshal
d10118e3d0 Fixes #11346 
Fixes #8123

Removes adminbus ability to call down the Icarus... because it's pretty broken.
 2015-12-12 12:03:15 -07:00
SkyMarshal
eae12b8f9c Fixes #8568 2015-12-11 19:52:18 -07:00
HarpyEagle
a9d3f02cd5 Updates preset TTV bombs, adds debug verb 2015-12-08 18:15:55 +01:00
PsiOmegaDelta
5a0d76d876 Merge pull request #11548 from Baystation12/master 
Dev-freeze
 2015-12-01 08:09:15 +01:00
Datraen
3506e0861c Fixes jumping, adds dev access to msay and ahelps. 2015-11-29 22:34:00 -05:00
PsiOmegaDelta
2d5677109f Build mode throws now admin logs. 
Fixes #11514.
 2015-11-29 12:14:31 +01:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
GinjaNinja32
d5928d9927 Merge pull request #11260 from mwerezak/ttv 
Fixes TTV Yield
 2015-10-10 09:05:00 +01:00
HarpyEagle
63838b01d4 Updates preset TTV bombs, adds debug verb 2015-10-09 11:18:12 -04:00
PsiOmega
5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
 2015-09-15 20:25:13 +02:00
Kelenius
9dd6f9762a Resolves #11049 2015-09-14 12:05:28 +03:00
GinjaNinja32
be2279106f Merge remote-tracking branch 'upstream/dev' into vv 
Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/admin/view_variables/topic.dm
 2015-09-10 03:06:27 +01:00
PsiOmegaDelta
94b4c483ba Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-08 08:22:37 +02:00
PsiOmegaDelta
2f183e1cee Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
	code/modules/nano/modules/human_appearance.dm
 2015-09-08 07:58:25 +02:00
Zuhayr
211e426009 Tweak. 2015-09-07 14:43:20 +09:30
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
Chinsky
a3b3e52959 Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir 2015-09-02 04:38:26 +03:00
PsiOmega
35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-08-29 10:06:18 +02:00
PsiOmega
ff7a4fc244 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/events/event_container.dm
 2015-08-28 11:18:57 +02:00
PsiOmega
f68275d91b Improved admin logging. 
log_and_message_admins() (which sure needs a shorter name) now uses key_name_admin() instead of just key_name().
Replaces calls to admin_log_and_message_admins() which did this with log_and_message_admins() instead.
 2015-08-27 20:20:20 +02:00
PsiOmegaDelta
bf3040cc2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-27 09:01:50 +02:00
PsiOmegaDelta
d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-08-27 08:53:22 +02:00
Zuhayr
b7c95f9c00 Merge pull request #10880 from Baystation12/dev-freeze 
Dev freeze
 2015-08-26 03:22:06 +09:30
Zuhayr
f4d27e8b1c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/admin/verbs/adminsay.dm
 2015-08-26 03:09:11 +09:30
PsiOmega
949cfdfc5b Restores special admin color in Msay 
Restores the special appearance admin name's had when using MSAY, to differentiate them from the masses.
 2015-08-25 19:06:52 +02:00
mwerezak
09f1c6054b Changed MSAY to show the ckey/character name like it does with asay 2015-08-23 20:27:56 -04:00
MrSnapwalk
d45d46f920 Resprites, renames, and repaths the detective uniforms. 2015-08-22 19:43:28 -05:00