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
29,427 Commits 5 Branches 0 Tags
f106b3f26ba12d46177cc1de76ef1c07b0400671
Commit Graph

89 Commits

Author SHA1 Message Date
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16 Merge pull request #810 from Zuhayr/bayupdate 
Bay update.
 2016-02-05 23:21:07 -05:00
Datraen
4c0bd923c3 Merge pull request #866 from Kelenius/viroRemoval 
Removes the old virus system
 2016-02-05 21:06:09 -05:00
Zuhayr
f31438bd77 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate 2016-01-30 08:49:35 +10:30
Kelenius
b86c730695 Removes the old virus system 
Appendicitis moved to appendix organ
 2016-01-27 11:44:41 +03:00
Zuhayr
58736fb4f6 Renaming Resomi to Seromi. 2016-01-27 14:24:09 +10:30
Zuhayr
eef9145486 Revert "Removes Resomi." 
This reverts commit c9f579e00a.
 2016-01-27 13:48:48 +10:30
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Kearel
5727971690 Semi ports Baystation12/Baystation12#11445 2016-01-25 20:35:52 +00:00
Jon
706d720757 Fight me etc. 2016-01-24 00:35:23 +00:00
Zuhayr
1c100bf457 Cleaning up post-merge. 2016-01-22 01:22:49 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr
51deb6cd7e Made old IPC icons into a mask slot item for prosthetic heads. 2016-01-05 16:20:42 +10:30
Datraen
37e1913fda Creates telecrystal item for exchanging telecrystals between antags. 2016-01-03 01:22:48 -05:00
GinjaNinja32
9dee0707e8 Merge remote-tracking branch 'polaris/master' into pl-chemistry 2015-12-24 15:06:16 +00:00
Neerti
084ba448fa Merge pull request #652 from Zuhayr/nerf 
Added Nerf weapons to Cargo.
 2015-12-24 06:47:48 -05:00
Zuhayr
e555c8432f Merge pull request #640 from Neerti/12/21/2015_event_tweaks 
Random Event Tweaks
 2015-12-24 22:11:19 +10:30
Zuhayr
996eecde3c Ticks foam weapon file. 2015-12-24 22:05:10 +10:30
GinjaNinja32
9c267539a3 Merge remote-tracking branch 'polaris/master' into pl-chemistry 2015-12-22 02:55:31 +00:00
Neerti
451c477e4c Tweaks event text to fit with the lore better. 
Adds more informative text for vending machines.
Removes RNG viruses.
 2015-12-21 04:01:05 -05:00
Zuhayr
c9f579e00a Removes Resomi. 2015-12-21 09:56:11 +10:30
Zuhayr
f2cc74d588 # This is a combination of 2 commits. 
# The first commit's message is:

Rewriting the mining turfs to reduce worldstart lag.

# This is the 2nd commit message:

Map cleanup.
 2015-12-16 15:26:38 +10:30
Zuhayr
6e8368ac4c Rewrote targeting. 2015-12-16 10:26:40 +10:30
Zuhayr
0148e78eda Removed targeting. 2015-12-16 10:25:18 +10:30
GinjaNinja32
075121d201 unix2dos polaris.dme 2015-12-15 18:08:15 +00:00
GinjaNinja32
53905d3669 add chemical regeneration to cartridge dispensers, remove energy dispensers 2015-12-14 23:01:45 +00:00
Neerti
8d3cc68771 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/14/2015_communicators_v2 2015-12-14 15:44:38 -05:00
Neerti
3e5436c4b7 Upgrades communicators to NanoUI, adds a new EPv2 fake networking system, adds new semi-telecomms machine, lets communicators call ghosts, call other communicators, and have as many ghosts or communicators linked as the user desires. Adds preference option to remain invisible on communicator device searches. 2015-12-14 15:43:53 -05:00
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
PsiOmegaDelta
9db4ba1da0 Adds a remote interaction state for NanoUI. 
This state has two checks:
A preliminary check of the remote target, ensuring it's powered, etc. If the remote target is fully disabled, it closes the window and conducts no further checks.
It then makes a full check, ensuring that the mob is capable, within range of the source remoting to the remote target, etc.

Unlike most other static interaction states, whoever initializes the remote state is responsible for deleting it properly.

Conflicts:
	polaris.dme
 2015-12-07 02:56:43 -05:00
Neerti
c808371780 Merge pull request #444 from Neerti/12/4/2015_communicators 
Adds cellphones!
 2015-12-05 17:37:35 -05:00
Neerti
3e946447a3 Adds cellphones! Details in the changelog entry. 2015-12-05 17:26:13 -05:00
GinjaNinja32
944b1255e4 add verbs to allow players to spin their view 2015-12-05 10:52:29 +00:00
Neerti
e528bb13cb Removes references to Lesser Form, a power that no longer exists. 2015-12-03 13:26:50 -05:00
Jon
5756e8e3bc Updates the dme to add the new surgery defines. 2015-12-02 15:02:24 +00:00
Neerti
f21aa3645a Fixes subspecies being available. 2015-11-28 22:56:50 -05:00
Neerti
87c54986da Adds the groundwork to define many, many places in the lore in-game. This could have several applications and help bring the fluff in-game. 
Places added:
Sol, needs lots of love.
Tau Ceti, needs more love.
Tajara, Skrell, and Unathi home systems.  Taj needs to be finished.
Nyx, and Vir.
 2015-11-26 10:41:19 -05:00
Neerti
b635a64530 Fixes socks. Again. For the third time. 2015-11-20 08:50:30 -05:00
Neerti
dd3ab4dac0 Finishes new ling, need better sprites but that's for another time. 2015-11-18 16:20:28 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge 
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
 2015-11-06 17:41:18 -05:00
Neerti
2f116e3374 Fixes a mistake involving belts not getting icons. 2015-10-29 21:56:36 -04:00
Neerti
92c1c468e4 Despite the name, they're not done, because reasons. 2015-10-29 21:22:42 -04:00
Woodrat
7128aa72db Woodrat 9.1 "Back in Action" 
- Super APC installed in Atmos
- Fixed APC, Mining Exterior APC
- Fixed Crematorium button, Installed mass driver button.
- Chapel hallway APC installed
- Gateway plugged in, console installed
- Elevator Console Installed, Bell Hop removed.
- Hazard stripes should be fixed
- Restored missing tiles (Hydro, Cafeteria Neutral, Asteroid exterior) (75% complete)
- Kitchen button restored
- Rec area bathroom lights restored
- Meat is back on the menu, two fridges with meat in the kitchen
- Unneeded wires in engineering maint removed.
- Medical substation wires fixed.
- Locker room maint APC installed
- Chapel maint APC installed
- Installed another light in robotics
- APC central maint installed
- Disposals pipe in engineering workshop fixed.
- Wire in atmos substation fixed.
 2015-10-16 22:57:13 -07:00
Neerti
7571ba8c4b Think I'm done. 2015-10-11 01:16:25 -04:00
SinTwo
ec58f7c705 TG_Port 
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/clothing/under/accessories/accessory.dm
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/mask.dmi
	icons/obj/clothing/hats.dmi
	polaris.dme
 2015-10-11 00:58:26 -04:00
Neerti
945aad7b4f Fixes some map stuff. 2015-10-11 00:04:28 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
 2015-10-10 23:17:26 -04:00
Neerti
a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge 
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
 2015-09-06 18:26:06 -04:00