cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,474 Commits 5 Branches 0 Tags
3ff956da69db8a83088a15bb59b238b32bab6e6b
Commit Graph

16867 Commits

Author SHA1 Message Date
Zuhayr
3ff956da69 Moved grown.dm to hydro folder for traits. 2015-02-04 10:46:24 +10:30
Zuhayr
d08861e25b Moved gas/light/pressure from hydro tray to seed datum 2015-02-04 10:46:10 +10:30
Zuhayr
0c0e197657 Seed packets are now generated via masks 2015-02-04 10:44:59 +10:30
Zuhayr
92d00eb87d Tweaks and fixes for growth and icon generation. 2015-02-04 10:44:16 +10:30
Zuhayr
f978e782f1 Tweaks. Trays now display their status when examined rather than attacked with an empty hand. 2015-02-04 10:44:00 +10:30
Zuhayr
06f26604d1 Xenoflora is now a sub-department of Xenobio rather than Science. 2015-02-04 10:43:50 +10:30
Zuhayr
983ca55c9d Autopopulates the plant and product icon lists at roundstart. Should make missing plant icons obnoxiously easy to spot due to a world output in bright red. 2015-02-04 10:43:33 +10:30
Zuhayr
b3e31bfa14 Reduced darkness of hydro icons. 2015-02-04 10:43:25 +10:30
Zuhayr
e5935e01f1 Span classes. 2015-02-04 10:43:01 +10:30
Zuhayr
78e61d9ccd Tweaks to xenoflora, added plant icons and colours to all plants. 2015-02-04 10:42:39 +10:30
Zuhayr
3c9bfbc751 Merge branch 'xenohydro_repair' into xenohydro 2015-02-04 10:40:37 +10:30
Zuhayr
26fe1a11a4 Adds exploding fruits. 2015-02-04 10:39:14 +10:30
Zuhayr
5538ce5589 Refactored nettles and sunflowers into regular plants. 2015-02-04 10:38:56 +10:30
Zuhayr
7bc70f46b0 Tweaks/fixes for fruit effects. 2015-02-04 10:37:54 +10:30
Zuhayr
b791c92c6e Added a fruit spawning debug proc. 2015-02-04 10:37:40 +10:30
Zuhayr
4791ef2b74 First pass on xenoflora expansion. 2015-02-04 10:37:37 +10:30
Zulker Nayeen Nahiyan
0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
 2015-02-04 04:44:09 +06:00
GinjaNinja32
05532fd330 Merge remote-tracking branch 'upstream/dev' into supply 2015-02-03 17:22:10 +00:00
GinjaNinja32
444c7c71f3 Maps in floor painter in engineering workshop, makes it and pipe painters orderable from Cargo 2015-02-03 17:19:45 +00:00
PsiOmega
49eac0d9ca Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 17:23:04 +01:00
PsiOmega
0d84f836a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-02-03 17:15:02 +01:00
PsiOmegaDelta
021096d924 Merge pull request #7841 from comma/firefirEFIREBURNAHAHAHA 
Ported TG's code for burny mobs, by ergovisavi.
 2015-02-03 17:02:09 +01:00
Chinsky
71b19d5d8f Stupid typo & missing constants 2015-02-03 18:44:26 +03:00
PsiOmegaDelta
24a7f5b5f0 Merge pull request #7938 from LethalGhost/dev 
More convenient give verb.
 2015-02-03 16:32:20 +01:00
Chinsky
84472462ab Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA 
Conflicts:
	code/modules/mob/living/living_defines.dm
 2015-02-03 18:30:18 +03:00
Chinsky
c3559556a0 Merge pull request #8027 from Baystation12/dev-freeze 
Wiz freeze
 2015-02-03 18:23:18 +03:00
Chinsky
576f9c84a3 Merge pull request #8016 from PsiOmegaDelta/Impersonation 
Voice changer impersonation now works.
 2015-02-03 18:16:23 +03:00
Chinsky
95ff9570ee Merge pull request #7930 from RKF45/newpaint 
Generic paint
 2015-02-03 18:15:42 +03:00
Chinsky
5ed006bcf0 Merge pull request #7902 from Kelenius/ofCratesAndMastermind 
Changes abandoned crate contencs and replaces minispess with mastermind
 2015-02-03 18:15:35 +03:00
Chinsky
7ef4192950 Merge pull request #7941 from mwerezak/radiator 
Expands on SkyMarshal's radiation changes
 2015-02-03 18:14:56 +03:00
Chinsky
889fee1b82 Merge pull request #7983 from PsiOmegaDelta/SynthStamp 
Timestamped AI radio messages.
 2015-02-03 18:14:44 +03:00
Chinsky
28ee1be312 Merge pull request #7952 from PsiOmegaDelta/AIEye 
Observers can now see the AI eye
 2015-02-03 18:14:08 +03:00
Chinsky
6c4f0a1541 Merge pull request #7949 from Loganbacca/pipemaker 
Mirrored manual T-valves
 2015-02-03 18:14:00 +03:00
PsiOmegaDelta
ba72db2275 Merge pull request #7866 from SparklySheep/patch-12 
Adds medical belts to sterile equipment crate.
 2015-02-03 16:12:40 +01:00
Chinsky
b6ca496a93 Merge pull request #7617 from fira/obscomps 
Observers Improvements: Ghosts are able to spy on computers, SMES and APCs, with NanoUI and OldUI support
 2015-02-03 18:12:16 +03:00
Chinsky
aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes 
refactor buckling + glowy HE pipes
 2015-02-03 18:12:09 +03:00
PsiOmegaDelta
cda262bbe4 Merge pull request #7863 from Kelenius/ofAlarmsAndScrubbers 
Adds oxygen and nitrogen to air alarm scrubber list
 2015-02-03 16:11:49 +01:00
PsiOmegaDelta
dd52f970e2 Merge pull request #7856 from mwerezak/emote 
Adds ^ say shortcut for visible emotes
 2015-02-03 16:11:36 +01:00
Chinsky
74df9669a0 Merge pull request #7719 from Zuhayr/species_tweaks 
Species tweaks.
 2015-02-03 18:11:18 +03:00
Chinsky
ac8043d926 Merge pull request #7767 from Amunak/research 
Allows printing lists of current research levels and technologies
 2015-02-03 18:11:06 +03:00
Chinsky
fb929a9688 Merge pull request #7796 from Kelenius/ofVendorsAndSeeds 
Replaces seed vendors with seed storages
 2015-02-03 18:10:57 +03:00
PsiOmegaDelta
70e8efb9fa Merge pull request #8018 from GinjaNinja32/ai 
Adds AI latejoin
 2015-02-03 16:10:46 +01:00
Chinsky
1c3b1087dd Merge pull request #7582 from Zuhayr/richard 
Do you like hurting other people?
 2015-02-03 18:10:34 +03:00
Chinsky
6546dc6a77 Merge pull request #7682 from SparklySheep/patch-11 
Adds the visitor alt-title.
 2015-02-03 18:09:50 +03:00
Chinsky
848d1cddd5 Merge pull request #7591 from mwerezak/custom-item 
Adds blue suit jacket to custom loadout gear
 2015-02-03 18:09:44 +03:00
Chinsky
81e40aa542 Merge pull request #7794 from sabiram/dev 
Adds approved custom item to common loadout pool
 2015-02-03 18:09:32 +03:00
Chinsky
a5ad6daba5 Merge pull request #7739 from Zuhayr/dev 
Readds moonwalking.
 2015-02-03 18:09:25 +03:00
Chinsky
b70db8d8d7 RIP in history, dead code 2015-02-03 17:19:56 +03:00
PsiOmega
a57cd8c380 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 14:51:54 +01:00
PsiOmega
1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge 
Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm
 2015-02-03 14:16:14 +01:00