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
57,556 Commits 5 Branches 0 Tags
abc6b8ad2bbb200becb9fd721ed66ea622a8128f
Commit Graph

57556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darlantan
abc6b8ad2b Disables Aurora Caelus event 2020-07-15 03:28:08 -04:00
Razgriz
7bf3bf8ba4 Merge pull request #391 from CHOMPStation2/Razgriz1032-patch-71 
Old Chomp port: mutants event, infestation fix
 2020-07-14 17:24:33 -07:00
Razgriz
8e47132edc Mutants event 
This is more of a blank commit to kick Travis
 2020-07-14 16:50:41 -07:00
Razgriz
ecd2ac03b1 DME for mutants evebt 2020-07-14 16:17:43 -07:00
Razgriz
31877ff416 Mutant event hostile mob files 
And these are the aggressive rats and lizardmen for the mutants event
 2020-07-14 15:39:52 -07:00
Razgriz
acfb4994b7 Mutant passive mobs 
Just the mice and the lizards before they evolve
 2020-07-14 15:39:01 -07:00
Razgriz
3fc88dee58 Mutant event control files 2020-07-14 15:37:30 -07:00
Razgriz
153c653595 Merge pull request #390 from CHOMPStation2/Razgriz1032-patch-72 
Fix NT Download relay
 2020-07-14 15:35:03 -07:00
Razgriz
dba722877a Fix NT Download relay 
Added the object back in, lol
 2020-07-14 15:19:39 -07:00
Razgriz
f93dcd26bb Lizardman sprites 
Separating into a _ch file
 2020-07-14 14:42:43 -07:00
Razgriz
feba76fa68 Update ticker.dm 2020-07-13 16:22:19 -07:00
Razgriz
62551d7fda Merge pull request #389 from CHOMPStation2/July2020UpstreamPull 
July2020 upstream pull
 2020-07-13 14:01:41 -07:00
Razgriz
d53baea58e Moar map fixes 2020-07-13 13:07:07 -07:00
Razgriz
206732ca71 MAP conflict edit 2020-07-13 12:40:54 -07:00
Razgriz
fe5302b139 Map fixes for closets 2020-07-13 05:04:53 -07:00
Razgriz
932299f75f Another comment fix 2020-07-13 03:22:59 -07:00
Razgriz
6bb324fd55 fix comment compile error 2020-07-13 03:08:46 -07:00
Razgriz
873371c41e Fixes roller beds and Pursuit RIG sprites 2020-07-13 01:31:05 -07:00
Razgriz
cb7d65e8e8 Fix SC Defines for weather sfx 2020-07-12 18:32:32 -07:00
Razgriz
16f9d43404 Map changes 2020-07-12 18:01:32 -07:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Razgriz
c6a42590ae Merge pull request #388 from Darlantanis/MapFixes 
Map Tweaks
 2020-07-08 03:22:24 -07:00
Darlantan
40553815a0 Map fixes 
-Fixes missing atmos pipes
-Stops dorm intercoms from broadcasting
 2020-07-08 02:58:12 -04:00
Repede
4b9a2bb47c Merge pull request #852 from SplinterGP/holdelta 
FIXES COOPER, THE MINING BOYYYY
 2020-07-06 20:31:30 -04:00
Repede
994706c4e8 Merge branch 'master' into holdelta 2020-07-06 20:17:28 -04:00
Repede
c283960cf3 Merge pull request #851 from Yawn-Wider/residentials 
replacing some windows with reinforced and added showers in one room
 2020-07-06 20:17:14 -04:00
SplinterGP
b3721ab15d Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-07-06 21:12:45 -03:00
SplinterGP
c7942a1d86 FIXES COOPER!!!!!!!1111!!1!!11!!!! 2020-07-06 21:12:25 -03:00
Repede
d3461364fa Merge branch 'master' into residentials 2020-07-06 19:57:25 -04:00
Repede
3bd2cd32c7 Merge pull request #850 from Yawn-Wider/xionalt 
Alt pattern for the xion outfit: named xion (yw alt)
 2020-07-06 19:57:18 -04:00
Repede
93c77db29f replacing some windows with reinforced and added showers in one room 2020-07-06 19:56:02 -04:00
Repede
270831bf92 Merge branch 'master' into xionalt 2020-07-06 19:23:15 -04:00
Repede
baaf131730 Alt pattern for the xion outfit: named xion (yw alt) - Spritefix by whiteout 2020-07-06 19:22:22 -04:00
Repede
66db612b48 Merge pull request #849 from SplinterGP/holdelta 
Fluffy birb stuff !
 2020-07-06 19:00:38 -04:00
SplinterGP
d01a0d207a Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-07-06 17:25:42 -03:00
SplinterGP
a056658ef6 Tesh fluffies 2020-07-06 16:58:15 -03:00
Izac Joof Forsgren
a6c854a7e1 Merge pull request #844 from Yawn-Wider/izac 
Preparations for tgs 4
 2020-07-06 16:01:35 +02:00
izac112
01a20369ee Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2020-07-06 15:39:21 +02:00
izac112
d9af2a4cca updates client procs.dm 2020-07-06 15:38:55 +02:00
Razgriz
a47b909aa9 Update deathclaw.dm 2020-07-05 20:01:08 -07:00
Razgriz
5a6750bf84 Add files via upload 2020-07-05 20:00:25 -07:00
Izac Joof Forsgren
2214949d79 Merge branch 'master' into izac 2020-07-05 22:38:39 +02:00
Izac Joof Forsgren
146c27632c Merge pull request #846 from lukevale/Luke 
Jean's chocolate box
 2020-07-05 16:45:33 +02:00
lukevale
8bebad0ead Jean's chocolate box 
Time for her to money shot with dat girl scout chocolates
 2020-07-05 09:22:21 -05:00
Izac Joof Forsgren
829a4b1e6a Merge pull request #845 from lukevale/master 
Adds in cyber dragon wings.
 2020-07-05 10:11:59 +02:00
lukevale
4c9cd195e4 Adds in cyber dragon wings. 2020-07-05 02:40:55 -05:00
izac112
4b55c8b507 Preparations for tgs 4 (does not actually change anything for current tgs version) 2020-07-04 23:37:42 +02:00
Izac Joof Forsgren
cd1f6a2e4d Merge pull request #843 from lukevale/Carpet 
Adds in the other carpet types as a buyable crate.
 2020-07-04 17:31:53 +02:00
Luke Vale
aae26a2b54 more screaming 2020-07-04 04:03:19 -05:00
Luke Vale
5824848a37 Merge branch 'Carpet' of https://github.com/lukevale/YWPolarisVore into Carpet 2020-07-04 03:56:38 -05:00