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
22,536 Commits 5 Branches 0 Tags
3ea720fd9d8ad721f033fd72dd91d00ca89fb5b9
Commit Graph

8868 Commits

Author SHA1 Message Date
Chinsky
3ea720fd9d Buttons refactoring. Introduced wonders of inheritance, cutting down on inconsistencies and copypaste. 2015-02-06 09:53:05 +03:00
Chinsky
3df6d38d2d Merge pull request #8047 from Neerti/1_30_2015_new_shuttle 
Expanded Escape/Transfer Shuttle
 2015-02-06 02:32:04 +03:00
Neerti
22ac05f9a0 Turns out, a new path isn't needed in the first place, and the bugs I found was me being dumb. Isn't that just grand? 
Reverts the /nolatejoin path.
 2015-02-05 16:41:00 -05:00
Chinsky
fc4e6796ce Merge pull request #8035 from PsiOmegaDelta/CanHasNano 
NanoUI/Topic make-over
 2015-02-06 00:15:04 +03:00
PsiOmega
a073cba477 Merge remote-tracking branch 'upstream/dev' into CanHasNano 
Conflicts:
	code/setup.dm
 2015-02-05 12:37:15 +01:00
Neerti
6567c68ecb Merge remote-tracking branch 'remotes/upstream/dev' into 1_30_2015_new_shuttle 2015-02-04 13:34:48 -05:00
Neerti
13d8bd47e7 Adds subtype of the AI core structure to disallow latejoining. 
Fixes a bug where carding an AI would free open a slot.
Adds cameras and holopads to the shuttle and a few areas at Centcom.
Adds check to AI's Life() to make sure it won't die in areas which have magical free power.
Adds subtype of oxygen canister, which starts off very cold.  This is meant to replace the freezer on Centcom, and for the emergency shuttle's cryo.
 2015-02-04 13:29:55 -05:00
Ravensdale
7d502aa255 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 07:40:20 -08:00
Chinsky
8a46903231 Merge pull request #7830 from PsiOmegaDelta/CanTrack 
Camera tracking logic cleanup and tracking notice feature.
 2015-02-04 18:17:21 +03:00
Chinsky
f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks 
Adds drying racks, tobacco, and updates pipes
 2015-02-04 18:15:13 +03:00
Chinsky
f1c5c9d08d Merge pull request #7680 from Skully71/chancespawn 
Add a chance spawn object to enable spawning a given object at chance
 2015-02-04 18:14:31 +03:00
Ravensdale
fcb2770004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 05:15:23 -08:00
RavingManiac
38d62a278a Holodeck code moved to modules, holo-object code put in separate file. Holodeck expanded from 5x10 to 10x10. Holodeck areas updated accordingly. Holodeck courtroom added. Holodeck gravity can now be toggled. Reduced stun-time from gravity turning on. Changed the thunk() message a bit. Window-doors can now be deleted silently. 
Changelog updated.
 2015-02-04 20:05:43 +08:00
Skully71
3d2abddaa7 Add random single object to enable a given object to be spawned at chance 2015-02-04 10:41:47 +01:00
Zuhayr
11ec632c22 Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap 2015-02-04 11:03:44 +10:30
Ravensdale
84fa5379c5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-03 15:18:27 -08:00
Ravensdale
2e275d7e5e Area cleanup part 1: Engineering Department 2015-02-03 14:50:11 -08:00
PsiOmega
566f6a104e Carded AIs can no longer access cameras through camera consoles. 
Also includes fixes for hidden uplinks.
 2015-02-03 23:44:35 +01:00
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
PsiOmega
ffa13c68cb Merge remote-tracking branch 'upstream/dev' into CanTrack 
Conflicts:
	code/modules/mob/living/living_defines.dm
 2015-02-03 22:27:22 +01:00
PsiOmega
21a0aa05e5 Topic now uses the NanoUI can_interact_with_interface() proc to determine functionality. 
can_interact_with_interface() has been updated with the old canUseTopic() checks.
 2015-02-03 20:24:11 +01:00
Kelenius
536388978f Conflict fix 2015-02-03 20:57:16 +03:00
Kelenius
0e7ed6aef4 Merge branch 'dev' into ofDryingAndRacks 2015-02-03 20:51:27 +03: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
95ff9570ee Merge pull request #7930 from RKF45/newpaint 
Generic paint
 2015-02-03 18:15:42 +03:00
Chinsky
6c4f0a1541 Merge pull request #7949 from Loganbacca/pipemaker 
Mirrored manual T-valves
 2015-02-03 18:14:00 +03: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
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
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
Chinsky
95eacd2185 Merge pull request #8008 from volas/sanitize_procs 
Fixes for some sanitize moments
 2015-02-03 15:08:47 +03:00
Chinsky
72463a35f3 Another pass at WIP folder 2015-02-03 12:14:13 +03:00
Chinsky
2a1f0849d8 Cleaned out my WIP folder. 2015-02-03 08:27:18 +03:00
D Anzorge
abeb634d01 Make borg radio window tell if loudspeaker is on 2015-02-02 16:27:14 -05:00
D Anzorge
609f9848bc Fix borg radio weirdness 
Borg radio interface toggling was backwards: when usr got the message that the subspace mode was
disabled, the radio would actually enter subspace mode.
 2015-02-02 16:27:14 -05:00
GinjaNinja32
271fe31e64 Admin verb to toggle latejoin-ability. Wipe Core disallowed in malfunction. 2015-02-02 18:34:26 +00:00
GinjaNinja32
6ea6c82897 AI latejoin 2015-02-02 17:59:57 +00:00
PsiOmega
eca4265abe Merge remote-tracking branch 'upstream/dev' into CanTrack 
Conflicts:
	code/game/machinery/camera/tracking.dm
 2015-02-02 08:15:41 +01:00
RKF45
6577cd2a55 Merge remote-tracking branch 'upstream/dev' into newpaint 
Conflicts:
	code/game/objects/items/weapons/paint.dm
 2015-02-01 23:04:18 +01:00
RKF45
4d8dd50cea Mixing of paint 
The generic paint can now be mixed and tranferred.
 2015-02-01 22:54:18 +01:00
volas
949ac26804 a few more copytext(sanitize()) fixes 2015-02-01 23:42:43 +03:00
volas
ea8e848463 copytext() check for some input 2015-02-01 23:16:04 +03:00
volas
8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
PsiOmega
6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01:00
Zuhayr
d6b03ea768 Merge pull request #7974 from mwerezak/ert 
ERT adjustment and fixes
 2015-02-01 20:47:40 +10:30
RKF45
4eb3e16f72 Reviewing paint recipes 
All recipes make "paint" and have different colours via var/resultcolor
White paint can also be made non-ghettoly.
 2015-02-01 01:34:39 +01:00