cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 13:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,307 Commits 9 Branches 0 Tags
65b5126147e841caf35d91e702b96265c0069b51
Commit Graph

13606 Commits

Author SHA1 Message Date
Zuhayr
cd4a8ff745 Amending a runtime in the mmi change. 2014-06-15 03:39:27 +09:30
Chinsky
1a3cd3786d Merge pull request #5239 from Nerezza/dronelights 
Built-in drone lighting
 2014-06-14 19:10:14 +04:00
Chinsky
e935cc0947 Merge pull request #5250 from Kelenius/OfCultistsAndRunes 
Rune drawing update
 2014-06-14 19:04:35 +04:00
igalan
9a27556421 Let's test this rebase thing. 2014-06-14 15:20:25 +01:00
Zuhayr
194f1121c3 Amending a previous commit. 2014-06-14 20:31:35 +09:30
Loganbacca
70a4e5a240 Cargo train bugfixes 
Also adds admin messaging when someone gets run over.
 2014-06-14 22:51:06 +12:00
Kelenius
db882ba664 Rune drawing update 2014-06-14 13:57:23 +04:00
Zuhayr
5ad652e90c Fixes #5195 2014-06-14 18:48:13 +09:30
Zuhayr
05a1bededb Fixes #5236 2014-06-14 18:39:33 +09:30
Zuhayr
15d063c130 Fixes #4959 2014-06-14 18:33:06 +09:30
Zuhayr
98bddb9612 Fixes #5245 2014-06-14 18:06:47 +09:30
Zuhayr
cd5818fd29 Fixes #5243 2014-06-14 18:06:31 +09:30
Zuhayr
cf1fe85e62 Fixes #5246 2014-06-14 18:04:19 +09:30
Zuhayr
80db3a284b Merge pull request #5216 from Loganbacca/trainmerge 
Cargo Trains
 2014-06-14 17:13:55 +09:30
Ccomp5950
5c115525cf Bugfix: Humans will no longer send the same message twice when talking on binary. 
Also:  Removed the beep boop boop from showing up if you are the src of the communication.
 2014-06-13 20:47:02 -05:00
Nerezza
52a76c0b0b Make drone light into verb 
Removes the penlight and builds a low power LED into the chassis.
Already tested to work locally, won't ghost a light.
 2014-06-13 14:39:49 -05:00
Mloc-Argent
9896e44d8a Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/unsorted.dm
 2014-06-12 18:56:26 +01:00
Chinsky
6d432d8e9d Merge pull request #5219 from Zuhayr/autolathe 
Autolathe rewrite.
 2014-06-12 20:28:44 +04:00
Ravensdale
1fe53510ed Merge branch 'master' of https://github.com/Baystation12/Baystation12 into freeze-master-merge 2014-06-12 05:04:28 -07:00
Zuhayr
0722775bda Merge pull request #5207 from mwerezak/get_turf_loc-cleanup 
Cleans up get_turf_loc()
 2014-06-12 18:13:01 +09:30
Chinsky
c56ab301d1 Compile fix for a fix for legcuffs. 2014-06-12 02:50:11 +04:00
Zuhayr
4244479e43 Reapplying some changes. 2014-06-12 01:23:32 +09:30
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
Chinsky
1f7a9355f8 Merge pull request #5212 from faerindel/hydro_refactor 
Hydroponics refactor, part 1: Files.
 2014-06-11 13:30:51 +04:00
Chinsky
238d5dfc2a Merge pull request #5211 from Ccomp5950/mentor_change 
Mentor permissions fixes and such.
 2014-06-11 13:16:18 +04:00
Chinsky
95781d751a Merge pull request #5206 from mwerezak/shoe-cuffs 
Fixes #5190
 2014-06-11 13:10:43 +04:00
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Zuhayr
06154d4d8d Further work on autolathe. 2014-06-11 15:39:14 +09:30
Ccomp5950
0e0c692634 Removed debugverb 2014-06-11 00:51:20 -05:00
Zuhayr
9aafac8ade Added multipliers to autolathe. 2014-06-11 15:06:46 +09:30
igalan
eee72ce802 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydro_refactor 2014-06-11 03:45:00 +01:00
igalan
7d08d4701c Hydroponics refactor, part 1: Files. 
No code actually modified, just moved from all over the place to a module folder.

defines/obj/hydro.dm split:
-Seeds into seeds.dm
-Tools like the analyzer, pest and weedkillers into hydro_tools.dm. Hatches and scythe from defines/obj/weapon.dm moved there too.
-Non-edible plants like nettles into grown_inedible.dm. Special procs in items/weapons/hydroponics.dm moved there.
-Biogenerator and hydroponics tray files moved.
 2014-06-11 03:44:29 +01:00
Ccomp5950
3aa766c689 Merge branch 'master' of github.com:Baystation12/Baystation12 into mentor_change 2014-06-10 19:49:42 -05:00
Ccomp5950
77c733b17c Mentor permissions fixes and such. 
Created a helper proc /proc/is_mentor(client) use this when determining if someone is a mentor and they aren't the usr of the proc (rights_check uses usr)

Mentors will no longer hear ghosts while playing
Mentors will no longer see orange text around names in check_player_age panel if they have special_roles
Mentors will no longer be able to tell players with special roles through the use of player_panel
Mentors will no longer be able to aghost, use antagHUD, then return to their bodies.
 2014-06-10 19:48:41 -05:00
Zuhayr
c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30
Zuhayr
5be9f0e12f Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:15:28 +09:30
Zuhayr
9339b1235b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-06-11 09:14:13 +09:30
Zuhayr
83aa460a98 Autolathe actually works now. 2014-06-11 09:12:35 +09:30
PsiOmega
6dd8e1e022 Fixes #5205. 
Creates a new area instance for the PDA messaging room in the AI zone.
 2014-06-10 20:32:16 +02:00
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf() 
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
 2014-06-10 13:43:11 -04:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
mwerezak
ed4fb8d3c6 Shuttles now dock on arrival and departure 
Squashes 3 commits:

Shuttles now dock on arrival and departure

Adds docking controller to outpost, tweaks

Finishes off shuttle_console
Could use some cleanup, though.
Commented out the debug stuff.
 2014-06-10 00:05:08 -04:00
mwerezak
b4bb8ab31d Reworks shuttles to be more extensible 
Kudos to Zuhayr for laying the groundwork for this.
 2014-06-09 23:41:29 -04:00
mwerezak
0319c96502 Adds docking support to shuttles, NanoUI 2014-06-09 23:41:08 -04:00
mwerezak
730623e6e4 Adds support for different shuttle states 
Also cleans up shuttle move states a bit.
Moves shuttle_console to it's own file
 2014-06-09 23:38:53 -04:00
mwerezak
63ea6eba0d Adds docking controllers to shuttles 
Shuttles dock at round start.
 2014-06-09 23:37:37 -04:00
Mike
129ee988b4 Adds a docking controller to the research shuttle 
Squashes 3 commits:

Adds a controller for single door based docks

Adds a docking controller to the research shuttle

Adds override control to airlock dock nano-ui
 2014-06-09 23:29:03 -04:00
mwerezak
ad7a1c5d59 Adds docking controllers 
Squashed 10 commits:

Adds simple docking controllers

Adds docking_controllers.dm

Moves docking handshake code into its own type
Keeps docking code separate from the code for messing with airlocks and
doors.

Improves handling of invalid states

Adds docking controller to research shuttle dock

Also adds the start of a nano-ui template.

Resetting the dock controller resets the override

Adds debug verbs

Adds support for overriding docking checks

Less confusing name for the docking program
 2014-06-09 23:14:53 -04:00
mwerezak
3bc6f4c9b6 Generalizes embedded_controller/radio 2014-06-09 23:08:07 -04:00
mwerezak
32ba5903b4 Generalizes embedded program 2014-06-09 23:05:58 -04:00