cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,546 Commits 7 Branches 0 Tags
13071d22665f51a165bee40f77c5128ea3a29253
Commit Graph

18124 Commits

Author SHA1 Message Date
Mechoid
98af877b21 Xenomorph Tweaks/Buffs. 2017-09-06 13:37:43 -07:00
Verkister
3bd672954d Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items) 
-Adds the approved fluff goggles https://forum.vore-station.net/viewtopic.php?f=26&t=1073
-Also adds general use metal necklace thingy and a colorable headband for loadout selection.
 2017-09-06 15:55:16 +03:00
Ketrai
0ae8e9521a Fixing outdated file 
grubs grubs grubs, we all live for the grubs
 2017-09-06 12:04:29 +02:00
Funce
df33837b54 pAI's (When in chassis form) now also get OOC prefs 2017-09-06 16:05:00 +12:00
Funce
9629b4ba0c You can now see Borg OOC prefs when you aren't the borg now 2017-09-06 16:04:27 +12:00
Neerti
5c8140ee0b Removes some world << output, fixes a few bugs. 2017-09-05 22:52:46 -04:00
Cameron653
06863de856 Fixes every problem in SS13 - Or maybe not. 2017-09-05 20:02:55 -04:00
Cameron653
82ee6e172a Makes pickup descriptions a bit more detailed, decreases pickup % diff 2017-09-05 19:51:28 -04:00
kcin2001
4da31bfdd1 changing the blurb to be more like what yosh said it should be 2017-09-05 12:06:32 -07:00
Ketrai
19f05fc628 fixed a tiny indent error 
wtf random tab
 2017-09-05 16:19:56 +02:00
Ketrai
592575cdca adds and enables grubevent 
shockin
 2017-09-05 16:12:50 +02:00
Ketrai
2d897fae13 adds grubmeat 
MEAT
 2017-09-05 16:11:41 +02:00
Ketrai
948f7b4724 Adds the grub event 
Randomly spawns about 8 grubs around station.
 2017-09-05 16:08:52 +02:00
Ketrai
674b310973 Adds new mob solargrub 
New mob
 2017-09-05 16:04:05 +02:00
Ketrai
08e98b9ba4 more grubtoxin stuff 
Adds vermicetol, secret chem to treat burns really effectively
 2017-09-05 16:01:36 +02:00
Ketrai
fb30c6f96b more grubtoxin stuff 
burn baby burn
 2017-09-05 16:00:11 +02:00
Ketrai
8673d5381a adds a chem for grubs 
they use it to burn people
 2017-09-05 15:58:27 +02:00
Ketrai
6dfbb1cda3 adds a chem for grubs 
grubs use this chem to burn people
 2017-09-05 15:57:11 +02:00
Neerti
6964f398c8 Map edits and small tweaks. 2017-09-05 02:35:37 -04:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again 
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
 2017-09-05 00:58:27 -04:00
kcin2001
e347c4f8b4 Merge branch 'master' into Harpy 2017-09-04 20:53:45 -07:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Anewbe
9ce3c85127 Merge pull request #3762 from Mechoid/Xeno_Tyranny_Electric_Boogaloo 
Brings back the aliens (With hitches).
 2017-09-04 18:32:25 -04:00
Anewbe
714288a365 Merge pull request #3761 from Cyantime/diagnostics 
Improves self-diagnosis verb for synthetic crewmembers.
 2017-09-04 16:23:15 -04:00
Kameren Arch
fde4f1fb5d adds 4 more monkeys to tf into 
sparra, wolpin, sobaka, and saru
 2017-09-04 13:32:26 -04:00
Anewbe
52b8d17caf Merge pull request #3752 from Woodratt/WR_Floor_type_change 
Floor tile, type and carpet change
 2017-09-03 17:11:39 -04:00
Anewbe
07564cbcac Merge pull request #3749 from Nalarac/Jetpack 
Removes Cyborg Module Restraint on Jetpack
 2017-09-03 17:09:43 -04:00
kcin2001
c16d91235c harpy to Rapala and harpy marking name changes 2017-09-03 13:48:00 -07:00
kcin2001
997c96c3a9 Harpy to Rapala 2017-09-03 13:45:57 -07:00
kcin2001
30d4fbf591 changing attacks to be just like humans since they dont have claws/sharp teeth 2017-09-03 13:42:30 -07:00
Mechoid
7de08c2420 Fix them Travis errors. 2017-09-03 13:21:05 -07:00
Spades
2dd7519e1b Loadouts 2017-09-03 14:33:13 -04:00
Cameron653
9f99603011 Update admin_verbs.dm 2017-09-03 11:10:27 -04:00
Cameron653
c7266f9cd8 Allows admins w/ debug access to restart the server easily 2017-09-03 11:09:40 -04:00
Mechoid
9b044309d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Xeno_Tyranny_Electric_Boogaloo 2017-09-03 01:54:10 -07:00
Mechoid
5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
kcin2001
57e0401365 changes harpy names to rapala/rapalans 2017-09-03 00:29:18 -07:00
Spades
3e2bd9b6cf Merge pull request #2092 from VOREStation/space-roman-elves 
Attack of the Space Elves
 2017-09-02 22:09:30 -04:00
Spades
68ac3454be Merge pull request #2034 from kcin2001/master 
Adds xeno heads to be used with xeno hybrids and xenolike races
 2017-09-02 22:04:42 -04:00
Cyantime
83240d1acd Improves self-diagnosis verb for synthetic crewmembers. 2017-09-02 16:20:40 -04:00
Spades
627410ca44 Merge remote-tracking branch 'refs/remotes/origin/master' into space-roman-elves 2017-09-02 04:08:47 -04:00
Spades
e2941dfb5a Fixes some badly done vorestation edits in gasmasks 
also adds my new gas masks
 2017-09-02 04:07:51 -04:00
Spades
a55d4c5e4c Imperial Military Update 
Adds Imperial stuff for our space elf romans.
 2017-09-02 04:07:25 -04:00
Spades
c8f716bd2d Lore tweaks 2017-09-01 23:41:08 -04:00
Anewbe
01f33216d2 Merge pull request #3759 from SpadesNeil/removes-unused-things 
Fixes "Death Commando" mask, changes its name
 2017-09-01 22:01:43 -04:00
Spades
5bbf24a386 Fixes "Death Commando" mask, changes its name 
No use letting unused assets go to waste.

At first I thought this was a redundant mask but it actually serves a
use, it's just coded wrongly.
 2017-09-01 20:09:31 -04:00
Spades
c89512940f Merge pull request #2089 from Verkister/ghostboop 
Adds a ghost verb to alert blank pAI cards.
 2017-09-01 18:11:20 -04:00
Spades
c1645841df Merge pull request #2087 from Yoshax/cya 
Removes whitelist requirements from Daemon and Enochian
 2017-09-01 07:09:02 -04:00
Spades
b8cfee22a9 Merge pull request #2085 from Verkister/synthpaintjurbs 
Enables markings system on synth body parts.
 2017-09-01 07:08:51 -04:00
Spades
689db71720 Merge pull request #2084 from Funce/log-spam-fix 
Reduces log spam from simple_animals
 2017-09-01 07:08:34 -04:00