cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,445 Commits 10 Branches 0 Tags
eeb5e66c75b4b028c167c6bdae26a3fd1ae72dba
Commit Graph

1297 Commits

Author SHA1 Message Date
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
Zuhayr
115eb19d33 Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate 2016-02-06 14:30:51 +10:30
Datraen
4c0bd923c3 Merge pull request #866 from Kelenius/viroRemoval 
Removes the old virus system
 2016-02-05 21:06:09 -05:00
Mark9013100
3853f34941 Makes the new security badges holobadges 2016-02-03 16:37:19 -05:00
Kelenius
cf244e07d6 Mulebots are now mobs 
obj/machinery/bot removed completely
Mulebot hacking removed, you can still disable their safety.
Mulebot PAD interface redone.
 2016-02-02 17:51:50 +03:00
Zuhayr
f31438bd77 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate 2016-01-30 08:49:35 +10:30
Mark9013100
51a9cef15f Adds more security badges/medals 2016-01-28 00:33:49 -05:00
Kelenius
b86c730695 Removes the old virus system 
Appendicitis moved to appendix organ
 2016-01-27 11:44:41 +03:00
Yoshax
ed4bc0264e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gameport2 2016-01-26 17:26:51 +00:00
Mark9013100
93148c27c3 Adds/edits a few cargo crates 2016-01-26 05:04:45 -05:00
Kearel
5727971690 Semi ports Baystation12/Baystation12#11445 2016-01-25 20:35:52 +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
Kelenius
138850a37b Fixes for vendors 2016-01-18 17:40:20 +03:00
Datraen
6df5225059 Adds comments, changelog. 2016-01-03 01:27:44 -05:00
Datraen
37e1913fda Creates telecrystal item for exchanging telecrystals between antags. 2016-01-03 01:22:48 -05:00
Zuhayr
5313c6b67b Added Nerf weapons to Cargo. Codersprites. 2015-12-24 22:05:10 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits. 
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
 2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options. 
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
 2015-12-24 21:10:33 +10:30
Mark9013100
cbbafa5170 Adds the black scrub cap 2015-12-21 12:25:43 -05:00
Mark9013100
a4b891f5ef Replaces the standard .45 pistol with the Detective's. 2015-12-20 15:36:26 -05: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
Neerti
ab66a273e0 Merge pull request #541 from Mark9013100/12/11/2015detbeltandsecedits 
Adds a detective belt and other edits for security
 2015-12-12 23:21:52 -05:00
Yoshax
48dcb85b44 Makes the mythical special blend whiskey real 2015-12-13 03:31:36 +00:00
Mark9013100
09b9be4b72 Adds a detective belt and other edits for security 2015-12-11 22:43:13 -05:00
Datraen
ef0337fccf Refactors Telecrystals into individual pools, adds a new command to allow for admins to modify telecrystal levels. 2015-12-11 21:14:11 -05:00
Neerti
5dbbbaa80b Merge pull request #456 from Zuhayr/master 
Porting forensics from Aurora.
 2015-12-10 19:50:44 -05:00
Hubblenaut
a046ad73ca Fixes backup power test light 2015-12-10 18:07:35 +01:00
Zuhayr
906318d3fc Compile fixes. 2015-12-10 19:22:15 +10:30
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
Mark9013100
7e68e3d490 Removes duplicate webbing from webbing crate 2015-12-08 22:16:55 -05:00
Neerti
e379810a07 Kills infinite loop, skins it, then makes a carpet out of it to decorate my imaginary room full of trophies of other bugs I've slain. 
The infinite loop occured due to the wire datum calling interact() on it's holder, which made it call Interact() on it's wire datum, and so on.
 2015-12-07 05:23:38 -05:00
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
 2015-12-06 11:34:36 +01:00
PsiOmegaDelta
da080df765 Fixes records unintentionally referencing each other. 
Because of the limitations of BYOND's bitwise operators (which affect both the old and new implementations of num2hex()), you cannot use numbers larger than 2^16 with that proc.
Manual port of https://github.com/PolarisSS13/Polaris/pull/430.
 2015-12-05 09:25:56 +01:00
MagmaRam
6c39070a15 Fix for records being a complete mess 
Because of the limitations of BYOND's bitwise operators (which affect both the
old and new implementations of num2hex()), you can't use numbers larger than 2^16
for this.

I cut the number of digits down to 4 and changed the maximum on the RNG to match.
 2015-12-04 22:28:53 -06:00
Mark9013100
6e0b906e23 Adds Security/Medical cargopacks. 2015-12-03 20:22:12 -05:00
Neerti
dc170af54e Update locations.dm 
Gets rid of debug verbs.
 2015-11-26 11:07:04 -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
PsiOmegaDelta
e715c16093 Character setup refactoring. 
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.

(cherry picked from commit e116721977)

Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	polaris.dme
 2015-11-20 07:46:31 -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
Chinsky
5acf5f1b7b Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup 
Character setup refactor.
 2015-10-26 05:44:13 +03:00
PsiOmegaDelta
e116721977 Character setup refactoring. 
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.
 2015-10-18 17:34:35 +02:00
Zuhayr
5dc6ff5da1 Merge pull request #11230 from PsiOmegaDelta/xenomorphs 
Xenomorph update
 2015-10-13 08:31:27 +10:30
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
 2015-10-11 17:37:01 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
Mark9013100
97a95c80a1 Department voidsuits can be ordered from cargo 2015-10-11 00:45:39 -04:00
Jon
9f2ec9c163 Adds three new hair flower pins - yellow, blue, and pink. 
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
 2015-10-11 00:26:54 -04:00