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
60,876 Commits 6 Branches 0 Tags
fd46ebb51aeba66abfe44b0477ccd2ce751bce0f
Commit Graph

11952 Commits

Author SHA1 Message Date
cadyn
b4a9632e16 Add logging for adrenaline rush being activated. 2020-11-13 22:54:02 -08:00
cadyn
33a411e662 Feedbaaack 2020-11-13 22:46:58 -08:00
cadyn
6c01fa902d swapped some numbers by mistake :p 2020-11-12 00:39:28 -08:00
Razgriz
e4e0b08da6 Merge pull request #788 from cadyn/ballistics-v2 
Ballistics v2
 2020-11-11 19:32:40 -07:00
Razgriz
c0ebd7d70a Merge pull request #821 from CHOMPStationBot/upstream-merge-9293 
[MIRROR] Couple little borgo belly tweaks.
 2020-11-11 19:30:07 -07:00
Razgriz
4545f66e7c Update dog_sleeper_vr.dm 2020-11-11 19:12:11 -07:00
Cadyn
6d5c74aa3c forgot the </span> oops 2020-11-11 13:55:57 -08:00
Cadyn
6d35d3f025 4.0 slowdown instead of 2.0 2020-11-11 13:46:09 -08:00
Cadyn
953b47764c Cadyn's traits v2 2020-11-11 12:34:31 -08:00
cadyn
29645e04e1 adding #ifndef for gaussian_random 2020-11-10 15:15:16 -08:00
Razgriz
5d1977b324 Merge pull request #817 from CHOMPStationBot/upstream-merge-9287 
[MIRROR] [MIRROR] Fresh Meat, Leatherworking
 2020-11-08 23:41:34 -07:00
Chompstation Bot
cb57a3061b Couple little borgo belly tweaks. 2020-11-08 17:29:36 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Razgriz
b65e414815 Merge pull request #811 from CHOMPStationBot/upstream-merge-9284 
[MIRROR] Adds a new marking.
 2020-11-07 11:57:58 -07:00
Verkister
8bac06a913 Merge pull request #9284 from Verkister/bean 
Adds a new marking.
 2020-11-07 14:31:12 +00:00
Cadyn
6fa317794b Cadyn's ballistic Overhauls V2 Finale 2020-11-05 16:44:47 -08:00
Razgriz
155421f465 Merge pull request #803 from cadyn/bugfixeroonis 
bugfixing my own shit
 2020-11-04 23:17:04 -07:00
Cadyn
67326bf93a bugfixing my own shit 2020-11-04 20:26:48 -08:00
Razgriz
a71b3c971c Merge pull request #798 from r4d6/photosynthesis 
Make synths able to take the Photosynthesis trait.
 2020-11-03 19:40:44 -07:00
Razgriz
44e62accd5 Merge pull request #794 from CHOMPStationBot/upstream-merge-9274 
[MIRROR] brings medihound hypo in-line with medihound sleeper
 2020-11-03 19:38:15 -07:00
r4d6
e3d7e63652 Make synths able to take the Photosynthesis trait. 2020-11-03 10:18:10 -05:00
Cadyn
67499d28c5 Ballistics v2 draft v2 
Introducing debugging messages and actually working ballistics
 2020-11-02 18:03:47 -08:00
Verkister
d3e62eab22 Merge pull request #9274 from Andromeda-K22/borg_hypo_buff 
brings medihound hypo in-line with medihound sleeper
 2020-11-02 08:49:29 +00:00
Razgriz
9b0386ac73 Merge pull request #789 from CHOMPStationBot/upstream-merge-9265 
[MIRROR] Ports Pixel shifting.
 2020-10-31 23:45:54 -07:00
Verkister
2e68ca894d Merge pull request #9265 from Detective-Google/pixel-shift 
Ports Pixel shifting.
 2020-10-31 19:37:42 +00:00
Cadyn
b3ba48084f Ballistics v2 draft 2020-10-31 12:21:21 -07:00
r4d6
207d2e03fb Chomps Edits & optimisation 2020-10-30 17:01:03 -04:00
r4d6
2505645e1b Show/Hide Nutrition Level 2020-10-30 16:33:22 -04:00
Razgriz
7fef5f5157 Merge pull request #764 from cadyn/tweakfixes 
Yummy bugfixes
 2020-10-28 21:50:24 -07:00
Razgriz
d41999432e Merge pull request #773 from CHOMPStationBot/upstream-merge-9248 
[MIRROR] [MIRROR] Adds the ability to choose your default unarmed attack
 2020-10-28 21:43:34 -07:00
cadyn
109f8c9b13 Merge branch 'master' into tweakfixes 2020-10-28 21:33:40 -07:00
Razgriz
f1ad20fed4 Update examine.dm 2020-10-28 18:47:25 -07:00
Razgriz
6ce0de0fdb Update human_movement.dm 2020-10-28 18:37:25 -07:00
Sym
6ef2a80baf Scream sounds for xenomorph and xenomorph hybrid 2020-10-28 17:26:14 -04:00
Verkister
f5e31602e5 Merge pull request #9248 from VOREStation/upstream-merge-7731 
[MIRROR] Adds the ability to choose your default unarmed attack
 2020-10-28 13:31:36 +00:00
Cadyn
947fe850ff Yummy bugfixes 2020-10-27 19:58:49 -07:00
Razgriz
f164c8212a Merge pull request #763 from CHOMPStationBot/upstream-merge-9252 
[MIRROR] [MIRROR] Stops slime securitrons from going ballistic when they get scratched
 2020-10-27 02:17:35 -07:00
Razgriz
21c2623f84 Merge pull request #762 from CHOMPStationBot/upstream-merge-9243 
[MIRROR] Adds the ability to hide, or reveal one's own wings with a verb
 2020-10-27 02:16:17 -07:00
Razgriz
34fcd2bcad Merge pull request #585 from MisterGrimm/ScreamForMe 
Added TGstation scream sound effects, and tweaked scream sound effect code.
 2020-10-27 02:08:15 -07:00
Verkister
c035527969 Merge pull request #9252 from VOREStation/upstream-merge-7738 
[MIRROR] Stops slime securitrons from going ballistic when they get scratched
 2020-10-27 08:18:54 +00:00
Verkister
ea6b6274ed Merge pull request #9243 from Runa-Dacino/Hidewingstry2 
Adds the ability to hide, or reveal one's own wings with a verb
 2020-10-27 08:17:46 +00:00
Razgriz
7d2b99504f Merge pull request #755 from CHOMPStationBot/upstream-merge-9250 
[MIRROR] Add Lamia Mobs (sprites by Prof. Smokey!)
 2020-10-27 01:13:24 -07:00
Sym
1b91203232 Most species can't use scream sounds now 
Not including those that already have scream sounds.
 2020-10-26 13:34:39 -04:00
Chompstation Bot
04a00319a7 Add Lamia Mobs (sprites by Prof. Smokey!) 2020-10-26 17:03:13 +00:00
Shadow-Quill
399dc17687 Fruit TRUE/FALSE 2020-10-25 23:24:56 -05:00
Nadyr
86e4507202 Merge pull request #753 from Darlantanis/PitcherPlantTweaks 
Nerfs space vine pitcher plants
 2020-10-26 00:18:25 -04:00
Nadyr
30717d0f05 Merge pull request #749 from cadyn/linguist 
Cadyn's traits changes part 1
 2020-10-26 00:01:38 -04:00
Darlantan
c9d60805b7 Nerfs space vine pitcher plants 
Also makes pitchers drop fruit on death, if they have a fruit.
 2020-10-25 23:43:20 -04:00
Razgriz
23defa0ac2 Merge pull request #747 from Darlantanis/PitcherPlants 
Pitcher plants
 2020-10-23 19:52:13 -07:00
Nadyr
2771750972 Update pitcher.dm 
tweaks I missed with the suggested commits
 2020-10-23 01:19:46 -04:00