cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,745 Commits 6 Branches 0 Tags
40e935a77422750c337ce7135d7cfeae85f8e5e3
Commit Graph

88 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
61d91af2bd [MIRROR] robot rejuvenate properly updates the icon again (#9883) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-01-15 13:14:32 +01:00
CHOMPStation2StaffMirrorBot
2d0719a4d4 [MIRROR] some dropped sanity (#9856) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-12 17:34:37 +01:00
CHOMPStation2StaffMirrorBot
ed79946ade [MIRROR] some istype to macros (#9802) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-05 23:01:49 +01:00
Kashargul
801238f4d2 [Manual Port] of #16707 Enable define sanity (#9651) 2024-12-16 23:31:49 +01:00
CHOMPStation2StaffMirrorBot
4ad41869ea [MIRROR] Fluff item (#9494) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2024-11-17 14:06:05 +01:00
CHOMPStation2
7416cbea22 [MIRROR] next set of spans (#9247) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-18 01:33:07 +02:00
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-04 15:00:17 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
CHOMPStation2
4153768ba1 [MIRROR] Job rank and radio channel rework (#8965) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-17 21:24:13 +02:00
Selis
ab7c087902 Juke Build Update (#7708) 2024-02-09 18:40:21 +01:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
CHOMPStation2
86fed82d17 [MIRROR] Remove all mention of nazis from code (#7000) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-18 18:07:17 +02:00
Heroman3003
59819128b4 Adds loaded dice + a custom item 2023-01-22 01:36:16 +00:00
Casey
5e53784213 Merge pull request #13718 from Runa-Dacino/card-numbering 
Makes it possible to tell how many cards someone has in a hand.
 2022-09-11 19:38:04 +00:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
62c04f34d1 Ports card icons from Eris. Implements them for VOREStation 2022-05-22 22:11:13 +00:00
Casey
9e7b86fcf6 Merge pull request #12811 from Runa-Dacino/schnapsen_icons 
Adds William Tell pattern for schnapsen
 2022-04-22 22:42:01 +00:00
Casey
97cc55a948 Merge pull request #12749 from Runa-Dacino/schnapsen_final_final 
Adds a new playing card game: schnapsen
 2022-04-17 09:24:23 +00:00
Casey
edbd4ebcd2 Wiz-Off Fix 2022-03-11 04:23:40 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Rykka
c88fae61c6 Fix 4 more relative paths + error 2021-09-16 09:54:43 -07:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
ee29b120ad Merge pull request #9511 from VOREStation/upstream-merge-7800 
[MIRROR] Fixes discarding cards onto walls
 2021-01-24 06:46:48 +00:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493) 
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
 2020-04-29 19:59:03 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Razgriz
2fbc749229 Merge branch 'master' into UpstreamMergeApril2020 2020-04-11 17:09:57 -07:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Razgriz
02d697c444 Axis rename 2020-04-09 13:58:07 -07:00
Razgriz
ab586de96d Axis rename 2020-04-09 13:40:45 -07:00
Shadowfire
5b0bfcde7a wip casino1 
Made confetti sprite and system
Made a confetti grenade
Made special casino card deck and sprites that doesnt contain joker
made sofa constructible from wood, still needs more work
added new casino card decks to casino map
 2020-03-02 22:30:33 +01:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Heroman3003
f65ac4fce9 Fixes deck of cards bringing up unnecesary prompt when picked up 2019-04-08 10:49:56 +10:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Leshana
a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00