cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,465 Commits 7 Branches 0 Tags
05a1bededb25073a869e679dd4b96b5d158b8166
Commit Graph

7490 Commits

Author SHA1 Message Date
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
Chinsky
6c78188007 Merge pull request #5175 from Hubblenaut/master 
Fixes some printouts causing a runtime error when photocopied
 2014-06-08 18:40:21 +04:00
GinjaNinja32
07e1701fbb Fixes shoulder holster 2014-06-08 15:25:04 +01:00
Hubblenaut
f12ee3f7b3 Fixes some printouts causing a runtime error when photocopied 2014-06-07 18:27:22 +02:00
Chinsky
e5a468521d Merge pull request #5167 from Hubblenaut/master 
Minor fixes
 2014-06-07 19:25:14 +04:00
Hubblenaut
eb2f9f0de1 Fixes stamp overlays being partly off the paper 2014-06-07 04:43:58 +02:00
Hubblenaut
a522cf9399 Fixes runtime error when copying the stamped EFTPOS paper 2014-06-06 20:45:39 +02:00
Zuhayr
d713b6517d Merge pull request #5152 from sick-trigger/master 
Small fixes/changes
 2014-06-07 03:03:14 +09:30
SparklySheep
8c6ee1061e Removes Impedrezene from the Paralysis Pen 
Because random brain damage from a pen is terrible, especially if you're trying to extract information from the person.
 2014-06-05 21:53:16 -05:00
Zuhayr
4233f2eb8c Update drone.dm 
Typo fix and message trim fix.
 2014-06-06 10:13:40 +09:30
sick-trigger
aecf06028e Painkillers leave body correctly 
Tramadol, paracetamol and oxy will now leave a mob's body. Fixes #5150.
 2014-06-05 18:09:18 +10:00
Hubblenaut
d5aacc8e79 Fixes setting internals on belt- and suit storage slots being ignored 2014-06-05 00:41:54 +02:00
Hubblenaut
106d0a4811 Fixed an issue with IBs being almost twice as bad 2014-06-05 00:02:44 +02:00
Zuhayr
65a2f590b7 Merge pull request #5136 from Zuhayr/master 
Serithi's request, taj and unathi spawn with sandals.
 2014-06-04 19:52:00 +09:30
Chinsky
13633b06db Merge pull request #5142 from mwerezak/vox-breathmask 
Fixes #5138
 2014-06-04 13:14:18 +04:00
Zuhayr
a00d4295a4 Fixed small drone talk and Bump() issues. 2014-06-04 16:26:12 +09:30
Ccomp5950
e490cfbea9 Merge pull request #5130 from mwerezak/drone-access 
Drone Fixes
 2014-06-03 19:49:15 -05:00
mwerezak
cc50ddf0d5 Fixes #5138 2014-06-03 20:10:24 -04:00
Ccomp5950
f0a75407b8 Rights check instead of holder check? Sure why not. 
Mentors can now see ahelps.
 2014-06-03 15:28:14 -05:00
mwerezak
a6bc516313 Readds flashes to all robots except drones. 
Drones also get a special low-power flashlight, now.
 2014-06-02 23:05:37 -04:00
mwerezak
29fac4e05c Adds drone cameras to engineering network 2014-06-02 20:13:23 -04:00
mwerezak
6b11904e28 Fixes all robot_modules having access to flashes 2014-06-02 20:09:09 -04:00
mwerezak
5a1782f2f1 ID swiping drones now uses visible_message() 2014-06-02 19:52:18 -04:00
mwerezak
475bd59284 Fixes #5118 
Also fixes robot/access() so that it will accept any one of the accesses
in req_access, instead of all - a much more likely use case.
 2014-06-02 19:38:33 -04:00
Mloc
171a8e2111 Merge pull request #5127 from Ccomp5950/mentor_change 
Mentor Unnerf.
 2014-06-02 22:20:24 +01:00
Chinsky
6599545499 Merge pull request #5119 from boopcat/happydrones 
refactors some disposals filtering code and remaps some disposals pipes
 2014-06-02 18:19:28 +04:00
Ccomp5950
1350115824 Mentor Unnerf. 
JMP was doing a rights check in the Topic instead of doing it on the proc, just went ahead and fixed the rights check to include mentors.
Mentors now have player panel but can't see traitor panel.  The idea is so they can't tell who is an antag through this.
 2014-06-02 07:09:00 -05:00
Chinsky
2c4e9a2f38 Merge pull request #5117 from Ccomp5950/mentor_change 
Mentor changes.
 2014-06-02 10:36:18 +04:00
Zuhayr
ff20919ab5 Fixes a minor icon-flicker thing with the drone fabricator. 2014-06-02 15:41:38 +09:30
Boop
168c39dd54 refactors some disposals filtering code and remaps some disposals pipes 
New things!
/obj/structure/disposalpipe/tagger
 - retags a holder when it passes through
/obj/structure/disposalpipe/tagger/partial - retags a holder when it passes through two times; good for loop detection
/obj/structure/disposalpipe/sortjunction/wildcard - filters out all holders that are tagged
/obj/structure/disposalpipe/sortjunction/untagged - filters out untagged holders

Tagging doesn't use an icky list index system any more, tags are put into a global list and directly checked against.

Changed the map around a bit, disposals is now a proper loop but anything that's not tagged, is tagged with "Disposals" or anything that passes the tagger twice will be filtered out.

Not a feature, just a fix for drones being sad about weird disposals. <3
 2014-06-01 23:30:20 +01:00
Ccomp5950
b0b7953af7 Mentor changes. 
Mentors no longer see stealthmins
Mentors no longer see antagonists / have check_antagonist verbs
New debug verb:  Reload Mentors (or mods)
 2014-06-01 13:51:49 -05:00
Zuhayr
5563fa9471 Typo. 2014-06-02 00:02:08 +09:30
Zuhayr
a7c3c67da8 Fixes #5098 2014-06-01 21:09:30 +09:30
Zuhayr
81af443155 Drones fixes. 2014-06-01 20:51:58 +09:30
Zuhayr
6eab07743a Merge pull request #5108 from Zuhayr/master 
Drone door fix.
 2014-06-01 02:41:22 +09:30
Zuhayr
a8ecbeb518 Drone door fix. 2014-06-01 02:38:02 +09:30
Zuhayr
9c5fe5d9f3 Merge pull request #5106 from Zuhayr/master 
Drone fixes.
 2014-06-01 02:08:30 +09:30
Zuhayr
a3be005113 Adds a drone spawn blurb. 2014-06-01 02:05:25 +09:30
Zuhayr
273f729eee Several drone fixes (walking over, pushing, pulling, AI sync) 2014-05-31 22:28:05 +09:30
Zuhayr
5f98ccaaf8 Added smaller spraybottle for drones. 2014-05-31 22:15:28 +09:30
Ccomp5950
b6b4d0826f Ghost dsay verbs. 
Now a bit more accurate.
 2014-05-31 02:33:51 -05:00
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev" 
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
 2014-05-31 00:25:56 +01:00
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
Ccomp5950
fd78c58f46 Bot down? Let's not lock up the entire server. 
Instead we'll spawn a thread to handle it, not like we care what is returned either way.
 2014-05-29 21:36:34 -05:00
Zuhayr
045168ba17 Merge pull request #5082 from mwerezak/inaprovaline 
Inaprovaline no longer a substitute for breathing
 2014-05-29 11:19:18 +09:30
mwerezak
47a7617edd Inaprovaline no longer a substitute for breathing 2014-05-28 11:27:21 -04:00