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
62,921 Commits 7 Branches 0 Tags
a95d7fa74623fb57547e510db8f466faf1da2d37
Commit Graph

43522 Commits

Author SHA1 Message Date
Razgriz
a95d7fa746 Update spider_infestation.dm 2021-04-06 16:28:07 -07:00
Nadyr
4efcf7ddb5 Merge pull request #1746 from CHOMPStationBot/upstream-merge-10084 
[MIRROR] Fixes buckle-scoop jank
 2021-04-06 01:45:28 -04:00
Nadyr
e253e0cc22 Merge pull request #1742 from CHOMPStationBot/upstream-merge-10079 
[MIRROR] tram+station take 2
 2021-04-06 01:42:43 -04:00
Novacat
f88b031492 Merge pull request #10084 from Verkister/patch-45 
Fixes buckle-scoop jank
 2021-04-05 23:04:25 +00:00
Chompstation Bot
76e61abca6 tram+station take 2 2021-04-05 05:30:18 +00:00
BlackMajor
3a9b149617 Adds event pref to character directory at Kassc's request (#1666) 
* Revert "Merge pull request #1 from CHOMPStation2/master"

This reverts commit b85a3b312d, reversing
changes made to a13aa8f367.

* Revert "Revert "Merge pull request #1 from CHOMPStation2/master""

This reverts commit 1149323e69.

* added event pref to directory

* Oh wait tgui gets mad at in-line comments
 2021-04-04 21:46:06 -07:00
Razgriz
0b809f8f62 Merge pull request #1738 from Darlantanis/WheatleySergalTaur 
Sprite refactor, sergal taur for Wheatley
 2021-04-04 21:45:30 -07:00
Razgriz
2931eb27b5 Merge pull request #1737 from Darlantanis/PeriFix 
Revert peridaxon recipe change
 2021-04-04 21:44:55 -07:00
Darlantan
59485aa770 Sprite refactor, sergal taur for Wheatley 2021-04-03 07:17:48 -04:00
Darlantan
39a376ef2c Revert peridaxon change 2021-04-03 04:35:16 -04:00
Nadyr
871db4f853 Merge pull request #1159 from CHOMPStationBot/upstream-merge-9589 
[MIRROR] Makes the beach cool
 2021-04-03 04:24:43 -04:00
Nadyr
f447d3c309 Create virgo4_vr 2021-04-03 03:31:47 -04:00
Chompstation Bot
413bafbb91 Some minor mapfixes 2021-04-03 02:40:33 -04:00
Nadyr
eaf59daa4a Merge pull request #1686 from CHOMPStationBot/upstream-merge-10028 
[MIRROR] Makes the event HUD work
 2021-04-03 01:55:52 -04:00
Nadyr
e25155514c Merge branch 'master' into upstream-merge-10028 2021-04-03 01:20:13 -04:00
Nadyr
92810c6698 Update movement.dm 2021-04-03 01:11:45 -04:00
Nadyr
c6bb60d172 Update living.dm 2021-04-03 01:09:45 -04:00
Nadyr
e7d1cc2259 Update teshari.dm 2021-04-03 01:06:06 -04:00
Nadyr
396255427f Update teshari.dm 2021-04-03 01:05:19 -04:00
Nadyr
9ccbd2fa6d Update species.dm 2021-04-03 01:01:13 -04:00
Nadyr
514a61ecde Update human.dm 2021-04-03 00:59:43 -04:00
Nadyr
4cbf330a93 Merge branch 'master' into upstream-merge-10055 2021-04-03 00:25:44 -04:00
Nadyr
a364bb759d Merge pull request #1735 from CHOMPStationBot/upstream-merge-10072 
[MIRROR] [MIRROR] Prevented Teshari from selecting positronic brains.
 2021-04-03 00:03:37 -04:00
Nadyr
5cfe385f39 Update teshari.dm 2021-04-02 23:46:13 -04:00
Nadyr
4ea1252f09 Merge pull request #1736 from CHOMPStationBot/upstream-merge-10074 
[MIRROR] Adds a verb for printing out vorebelly settings into chat for copypasting
 2021-04-02 23:37:00 -04:00
Nadyr
1d0086de0c Merge pull request #1717 from CHOMPStationBot/upstream-merge-10058 
[MIRROR] [MIRROR] Updates respawn_character some more
 2021-04-02 23:31:45 -04:00
Nadyr
1c6390c1e3 Merge pull request #1706 from CHOMPStationBot/upstream-merge-10046 
[MIRROR] [MIRROR] Tanning Tweaks
 2021-04-02 23:29:50 -04:00
Nadyr
eb3bbb3502 github stop 2021-04-02 23:14:03 -04:00
Nadyr
8676606747 Update update_icons.dm 2021-04-02 23:11:41 -04:00
Nadyr
1998e90f55 Update update_icons.dm 2021-04-02 23:05:23 -04:00
Nadyr
b3da731692 Update teshari.dm 2021-04-02 23:00:03 -04:00
Nadyr
2d28682a36 Update material_recipes.dm 2021-04-02 22:53:31 -04:00
Novacat
d31519daba Merge pull request #10074 from Verkister/spambutt 
Adds a verb for printing out vorebelly settings into chat for copypasting
 2021-04-02 17:59:52 +00:00
Chompstation Bot
9029dfd48d [MIRROR] Prevented Teshari from selecting positronic brains. 2021-04-02 17:58:45 +00:00
Razgriz
47597f90c4 Update protean_powers.dm 2021-04-02 02:29:52 -07:00
Razgriz
1362cd2ea1 HOPEFULLY nerf protean metal eating this time 2021-04-02 02:28:19 -07:00
Razgriz
156df2c64d egg 2021-04-01 00:20:57 -07:00
Razgriz
d6a3cfb1de Merge pull request #1715 from CHOMPStationBot/upstream-merge-10054 
[MIRROR] [MIRROR] Non-mobs aren't allies
 2021-03-31 04:32:29 -07:00
Razgriz
2cbb6de9b8 Merge pull request #1712 from CHOMPStationBot/upstream-merge-10052 
[MIRROR] [MIRROR] Fixes runtime in prison_break.dm, line 214
 2021-03-31 04:32:08 -07:00
Razgriz
242d2b01a3 Merge pull request #1711 from CHOMPStationBot/upstream-merge-10053 
[MIRROR] [MIRROR] Fixes runtime in chunk.dm: line 91, I think?
 2021-03-31 04:31:39 -07:00
Chompstation Bot
b2c54ae3f6 [MIRROR] Updates respawn_character some more 2021-03-31 09:41:14 +00:00
Razgriz
70b9abd0da Update thinktank_module.dm 2021-03-31 02:20:46 -07:00
Razgriz
e9cfca5370 Update misc_vr.dm 2021-03-31 02:18:45 -07:00
Razgriz
155a10336c Update portable_turret.dm 2021-03-31 02:14:46 -07:00
Novacat
14c06e288a Merge pull request #10054 from VOREStation/upstream-merge-7999 
[MIRROR] Non-mobs aren't allies
 2021-03-31 09:14:37 +00:00
Chompstation Bot
088d05245d [MIRROR] Tesh gliding tweaks. 2021-03-31 09:14:30 +00:00
Novacat
21bce86db4 Merge pull request #10052 from VOREStation/upstream-merge-8001 
[MIRROR] Fixes runtime in prison_break.dm, line 214
 2021-03-31 09:13:17 +00:00
Novacat
f486590027 Merge pull request #10053 from VOREStation/upstream-merge-8000 
[MIRROR] Fixes runtime in chunk.dm: line 91, I think?
 2021-03-31 09:13:12 +00:00
Razgriz
2d9788c3ae Update phase.dm 2021-03-31 01:49:02 -07:00
Razgriz
962992d171 Added safety lock feature to phaseguns, same as frontier phaser 
Added safety lock feature to phaseguns, same as frontier phaser
 2021-03-31 01:35:35 -07:00